Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-21

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

All times shown according to UTC.

Time Nick Message
00:01 eletuchy_ joined #git
00:04 fstd joined #git
00:04 eletuchy joined #git
00:05 alex1a joined #git
00:07 eletuch__ joined #git
00:07 jimi_ joined #git
00:09 rominronin joined #git
00:09 eletuchy_ joined #git
00:09 d0nkeyBOB joined #git
00:12 eletuchy joined #git
00:14 eletuchy_ joined #git
00:17 zeemz joined #git
00:18 espindola joined #git
00:18 italoacasas joined #git
00:19 backnforth joined #git
00:20 Rodya_ joined #git
00:21 Ahmed90 joined #git
00:21 tjbp joined #git
00:21 tesuji__ joined #git
00:22 ahmedelgabri joined #git
00:24 mda- joined #git
00:26 jaguarmagenta joined #git
00:28 arescorpio joined #git
00:34 EvilPenguin joined #git
00:35 tjone270 joined #git
00:36 zivester joined #git
00:36 M-ou-se joined #git
00:41 infernix joined #git
00:42 hahuang62 joined #git
00:44 watabou joined #git
00:47 CEnnis91 joined #git
00:51 therealGent joined #git
00:52 cqi joined #git
00:54 wloncom joined #git
00:58 annoymouse joined #git
00:58 fstd_ joined #git
01:01 xall_ joined #git
01:01 fracting joined #git
01:01 cdg joined #git
01:07 GandalfTheWizard joined #git
01:10 Gsham joined #git
01:10 rominronin joined #git
01:11 noodle joined #git
01:17 xcesariox joined #git
01:19 kutsuya joined #git
01:19 hexagoxel joined #git
01:27 oblivioncr joined #git
01:28 taylorm joined #git
01:31 checkItOut joined #git
01:32 watabou joined #git
01:33 texinwien joined #git
01:35 Nate_ joined #git
01:36 checkItOut joined #git
01:40 artemisart joined #git
01:42 Goplat joined #git
01:46 hahuang62 joined #git
01:46 fracting joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and plumbing advice | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Remember to keep your porcelain clean
01:51 Wulf4 joined #git
01:52 zumba_addict joined #git
01:53 raijin joined #git
01:59 pks joined #git
01:59 Thorn joined #git
02:02 drbean joined #git
02:02 netj joined #git
02:10 xaviergmail joined #git
02:11 rominronin joined #git
02:12 lindenle joined #git
02:12 Azy8BsKXVko joined #git
02:12 dreiss joined #git
02:13 Rodya_ joined #git
02:13 Azy8BsKXVko Hi all. I keep trying to push to my GitHub repo, but whenever I enter my (correct) username and password (checked about a dozen times) I get a failed to authenticate error.
02:14 Azy8BsKXVko Could it have to do with how I enabled TFA on GitHub recently?
02:15 chachasmooth joined #git
02:16 Azy8BsKXVko *2FA, also found something that might help.
02:16 Azy8BsKXVko https://gist.github.com/wikimatze/9790374
02:17 b1tchcakes joined #git
02:18 xaviergmail joined #git
02:18 Azy8BsKXVko left #git
02:19 cqi joined #git
02:23 ahmedelgabri joined #git
02:25 fscala joined #git
02:27 jaguarmagenta joined #git
02:28 mmlb joined #git
02:34 inflames joined #git
02:37 sentriz joined #git
02:40 sdothum joined #git
02:43 kadoban joined #git
02:43 hahuang62 joined #git
02:44 tchan joined #git
02:45 iveqy joined #git
02:46 hexagoxel joined #git
02:49 est31 joined #git
02:50 est31 I'm having issues git cloning a specific project from codeplex
02:50 est31 git clone works really well for other sites
02:50 est31 like github
02:50 est31 or so
02:50 est31 but when I try to do git clone https://git01.codeplex.com/veracrypt
02:50 est31 then It gives me an error "error: RPC failed; curl 56 GnuTLS recv error (-110): The TLS connection was non-properly terminated."
02:51 boombatower joined #git
02:51 est31 any ideas for how to debug this
02:52 samson joined #git
02:53 ojacobson est31: either you have a network proxy in the middle fucking up TLS for you, or your TLS client libs (GnuTLS?) are out of date and need updates, I suspect
02:53 ojacobson Evidence: I can `git ls-remote https://git01.codeplex.com/veracrypt` from here (no proxy, up-to-date Mac OS TLS libs) just fine
02:53 ojacobson 36f53056adaa334b946029580d1d3ce433b9af69HEAD
02:53 feignix joined #git
02:53 ojacobson
02:54 est31 ls-remote works for me as well
02:54 samson need to ignore all files and subdirectories in a directory. Would I just add "dir\**" to the .gitignore?
02:54 samson (complete git newb btw)
02:54 est31 samson, just add dir/
02:54 ojacobson samson: dir or dir/
02:54 samson ah!
02:55 ojacobson or /dir/ if you need to anchor the ignore to the root of your project
02:55 a3Dman joined #git
02:55 samson simpler than I thought
02:55 samson hmm, what do you mean by anchor to the root of my project? :p
02:56 est31 ojacobson, my gnutls libraries should be rather recent
02:57 est31 ojacobson, I use 3.4.10
02:57 Asiajey joined #git
02:57 est31 also, I have no proxy that I know of
02:58 est31 what's interesting, other projects work
02:59 est31 git clone https://git01.codeplex.com/fastbinaryjson for example
02:59 Lyqyd joined #git
02:59 est31 ojacobson, do you know of a way I can use to debug the issue
02:59 samson I need to make sure that git is going to ignore those directories (HUGE stores of data) before I publish. How can I make sure?
02:59 est31 I have tried passing the --verbose flag
02:59 est31 but that flag doesnt help
02:59 est31 samson, use git status
03:00 samson est31: thank you
03:00 est31 samson, also, your git client usually shows up the added files in a commit before you do a commit
03:00 ojacobson est31: GIT_CURL_VERBOSE=1 git …
03:00 ojacobson git uses libcurl for https repos
03:01 samson yeah I thought so. Hmm they're showing up in both
03:01 est31 ojacobson, thanks
03:02 est31 it doesnt seem to provide more details
03:02 est31 not for the part where the connection terminates
03:03 est31 ojacobson, is there an analogous way to do it for gnutls?
03:04 samson Hmm, I did need the asterix actually
03:04 samson eh, I spoke too soon
03:05 dmto joined #git
03:08 samson okay, so it seems like it was attempting to remove all the files from the tracked files but then it stopped half way
03:08 est31 samson, you might want to do git reset HEAD this will clear your staging area
03:08 est31 maybe there is per directory git reset already
03:08 est31 dunno
03:11 hhee joined #git
03:11 samson est31: thanks again. Yeah that did it.
03:12 rominronin joined #git
03:12 eletuchy joined #git
03:15 samson is there a way to find the size of the staged files?
03:16 est31 hrmm this might be ithttp://askubuntu.com/a/187199
03:16 est31 http://askubuntu.com/a/187199
03:17 thiago joined #git
03:19 Gianormagantrous joined #git
03:19 Gianormagantrous joined #git
03:19 emPi joined #git
03:20 ome joined #git
03:20 shgysk8zer0 joined #git
03:20 k3rn31 joined #git
03:23 lolmac joined #git
03:24 ahmedelgabri joined #git
03:26 taylorm joined #git
03:27 Robdgreat joined #git
03:28 dmto joined #git
03:31 lindenle joined #git
03:36 TalkToMe joined #git
03:36 ramsub07 joined #git
03:37 cyphase joined #git
03:39 romerocesar joined #git
03:39 Thorn joined #git
03:39 gelei007 joined #git
03:41 jon-mac joined #git
03:44 Thorn__ joined #git
03:44 hahuang62 joined #git
03:48 toblogan joined #git
03:49 nnyk_ joined #git
03:52 espindola joined #git
03:53 jeffreylevesque joined #git
03:55 toblogan joined #git
03:56 eletuchy joined #git
03:56 SwiftMatt joined #git
03:57 phanimahesh joined #git
04:06 Cabanossi joined #git
04:08 meloc joined #git
04:08 mehola joined #git
04:08 meloc joined #git
04:13 rominronin joined #git
04:15 dreiss joined #git
04:16 inflames joined #git
04:16 k3rn31 joined #git
04:17 rscata joined #git
04:18 dave0x6d joined #git
04:19 rkazak joined #git
04:20 howdoi joined #git
04:24 jaguarmagenta joined #git
04:32 sdothum joined #git
04:35 McNozes joined #git
04:36 nilg joined #git
04:42 dave0x6d joined #git
04:43 Ma5ter joined #git
04:44 Ma5ter joined #git
04:44 subhojit777 joined #git
04:45 hahuang62 joined #git
04:45 Ma5ter joined #git
04:52 diegoaguilar joined #git
04:52 johnny56_ joined #git
04:54 espindola joined #git
04:54 pwnz0r joined #git
04:55 artemisart joined #git
04:55 clemf joined #git
04:57 dreiss joined #git
04:59 T4nk5bb0t joined #git
05:03 a_thakur_ joined #git
05:03 Cabanossi joined #git
05:04 dreiss joined #git
05:07 Vgr joined #git
05:07 leeN joined #git
05:10 nnyk_ joined #git
05:10 SwiftMatt joined #git
05:11 BrewBeer joined #git
05:12 cyan__ joined #git
05:14 rominronin joined #git
05:15 xaa joined #git
05:15 stuh84 joined #git
05:16 TalkToMe joined #git
05:17 sauvin joined #git
05:22 guardianJ joined #git
05:24 Ma5ter joined #git
05:25 ahmedelgabri joined #git
05:28 BrewBeer left #git
05:30 jstimm_ joined #git
05:32 fracting joined #git
05:34 DuckMaestro joined #git
05:34 mariuscc joined #git
05:37 _ng joined #git
05:37 lindenle joined #git
05:37 qt-x joined #git
05:42 mithenks joined #git
05:42 Alienpruts joined #git
05:43 githogori joined #git
05:44 cqi joined #git
05:45 ThomasLocke joined #git
05:46 hahuang62 joined #git
05:46 durham joined #git
05:47 ShekharReddy joined #git
05:48 apotry joined #git
05:50 zeroed joined #git
05:50 zumba_addict joined #git
05:52 ronskisika joined #git
05:53 Codfection joined #git
05:53 jason237 joined #git
05:54 espindola joined #git
06:00 sword` joined #git
06:01 jmpp joined #git
06:01 * jmpp greets!
06:02 jmpp I have a non-bare repo I configured with "receive.denyCurrentBranch updateInstead"
06:02 jmpp when I push into it, the tip of my master branch is successfully checked out
06:02 rominronin joined #git
06:02 jmpp however, when I include a .git/hook/push-to-checkout hook, with proper execute permissions, the branch is not checked out upon push
06:03 jmpp and I get no errors of any kind
06:03 jmpp how may I check what may be at fault?
06:03 TomyLobo joined #git
06:03 lindenle joined #git
06:04 zeroed joined #git
06:04 zeroed joined #git
06:04 jmpp the hook explicitly exits with a zero code
06:05 jmpp and when I move it aside, checkout functionality is restored
06:05 zeroed joined #git
06:05 zeroed joined #git
06:05 jmpp so apparently there's something wrong with my script, but I don't quite know how to debug the situation
06:05 mithenks` joined #git
06:05 MrMojito_Busy joined #git
06:05 theskillwithin joined #git
06:06 zumba_addict joined #git
06:08 D-Boy joined #git
06:08 guest677 joined #git
06:12 Phreya joined #git
06:12 circ-user-aKdA0 joined #git
06:14 SwiftMatt joined #git
06:15 milki whats checkout functionality?
06:15 milki you can always have your hook output to stdout/stderr
06:17 son joined #git
06:17 jmpp milki: and I'd get that stdout/stderr output through ssh?
06:18 milki yeah
06:18 jmpp I really don't get what's going on
06:18 Phylock joined #git
06:18 thiago jmpp: create a log of the execution of the script
06:18 jmpp I even wrote a small script to recreate a repo from scratch, configure it, & copy the script into it
06:18 milki i should do -x for my bash scripts when deving devving them
06:18 milki i usually*
06:18 jmpp when I leave that last part out and push, the checkout happens
06:18 jmpp when I copy the script in, it doesn't
06:19 jmpp thiago, milki: how do I enable that logging? simple -x in the shebang?
06:19 thiago that will produce the output, but won't be captured anywhere
06:19 milki logging would be redircing output to append to a file...
06:19 thiago you need to redirect it somehow to a log file
06:19 ahmedelgabri joined #git
06:19 jmpp simple shell redirection, then?
06:19 milki thiago: stderr gets passed back to the clinet
06:20 taylorm joined #git
06:20 thiago oh?
06:21 jmpp yeah, I do see sh debug output sent through ssh
06:21 jmpp my script is literally two lines, a find(1) call to adapt some file permissions, and exit 0
06:21 milki thiago: thats how you can make informative hooks
06:21 jmpp I see both as a result of the push, but no checkout
06:22 milki jmpp: i dont really understand what you mean by checkout in any of your cases
06:22 milki jmpp: if you expect a push to automatically update the working tree of the remote, git doesnt do that unless your hook does it
06:23 jmpp even if I have receive.denyCurrentBranch updateInstead?
06:23 jmpp without the hook, the master is indeed checked out
06:23 milki whoa, is this new o.O
06:23 jmpp does the mere presence of the push-to-update hook override that?
06:23 jmpp what's new?
06:24 milki i havent seen this value for the config before
06:24 Repox joined #git
06:24 milki guess we could update !deploy with this option
06:24 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
06:24 fracting joined #git
06:24 Rish joined #git
06:24 milki ok, /me reads man githooks for this new hook
06:24 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
06:25 rchavik joined #git
06:25 jmpp I'v been using "receive.denyCurrentBranch updateInstead" for a while already
06:25 jmpp but this is the first time I hook a git hook into this workflow
06:25 milki ok, so exit 0 is the proper script response
06:25 thiago jmpp: the hook overrides the option
06:25 jmpp because I need my files to have a specific set of permissions, and git doesn't record them
06:25 thiago you need to do what you want to happen
06:26 milki ah
06:26 milki jmpp: so if you dont have the hook, then git uses a default for the checkout
06:26 jmpp thiago: where's that explained? I've been reading documntation and I can't find it (though I may have missed it due to lack of sleep ;)
06:26 milki jmpp: if you have the hook, then you need to to dthe checkout yourself
06:26 milki . Or it can make any necessary changes to the working tree and to the index to bring them to the desired state when the tip of the current branch is updated to the new commit, and exit with a zero status.
06:27 milki This hook is to be used to override the default behaviour.
06:27 milki jmpp: it shows you how to do the default behaviour
06:27 jmpp OK
06:27 jmpp it does?
06:27 * jmpp reads again
06:28 milki the read tree part
06:28 thiago jmpp: in man githooks
06:28 gitinfo jmpp: the githooks manpage is available at http://jk.gs/githooks.html
06:28 milki back in the day, there were only like 7 hooks
06:28 milki now thers like 15 o.O
06:29 thiago "It can exit with a non-zero status to refuse the push [...]. Or it can make any necessary changes to the working tree [...] and exit with a zero status."
06:29 thiago milki: yeah, lots I didn't know about
06:29 jmpp "This hook is to be used to override the default behaviour." baaahhh, facepalm!
06:31 Rish joined #git
06:31 feignix joined #git
06:31 vuoto joined #git
06:32 jmpp + git checkout master
06:32 jmpp error: pathspec 'master' did not match any file(s) known to git.
06:32 jmpp :/
06:32 jmpp what gives?
06:32 thiago jmpp: do you have a branch called "master" ?
06:33 jmpp yeah, it's what I'm pushing
06:33 thiago does git branch list it?
06:34 TomyLobo joined #git
06:34 mithenks joined #git
06:34 jmpp well, the repo is empty prior to receiving the push
06:34 jmpp but, by the time this hook is executed, hasn't the pack been fully received?
06:34 thiago apparently, it hasn't
06:35 durham joined #git
06:35 JeroenT joined #git
06:35 thiago that makes sense, you're supposed to decide whether to update the branch or not
06:35 thiago so it hasn't been updated
06:36 thiago note that you're supposed to "fix" the checkout and index prior to the update
06:36 thiago you do not do the update
06:36 jmpp git branch -vva definitely doesn't list it
06:36 thiago are you sure you're looking at the correct hook?
06:37 pwnz0r joined #git
06:37 jmpp push-to-checkout is indeed the functionality I'm looking for
06:37 thiago what problem are you trying to solve?
06:38 jmpp I need a non-bare repo, and need to adapt the checkout after an update has been received
06:38 Ma5ter joined #git
06:38 thiago s/after/before/
06:38 thiago that's what push-to-checkout does
06:38 thiago it operates *before* the update
06:38 thiago so, you're looking at the wrong hook
06:38 Assimilater joined #git
06:38 jmpp and is there anything that operates *after* the checkout?
06:38 fscala joined #git
06:39 thiago yes
06:39 thiago man githooks list them
06:39 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
06:39 milki this hook should be fine. it runs before the update but you dont need the update
06:39 thiago you're looking for post-update
06:40 milki you checkout given the sha given to the script
06:40 jmpp let me try post update
06:40 jmpp milki: what are the input parameters?
06:40 Alienpruts joined #git
06:40 jmpp I have no problem in checking out a sha directly and remainign in detached head state
06:40 milki also listed in sthe manpage
06:40 jmpp ;)
06:41 * jmpp does his homework and reads
06:41 milki and the variable is shown in the example
06:41 milki its not very explicit about it
06:41 milki only the stdin args for some of the hooks are shown since the format matters
06:42 milki otherwise, the manpage verbosely describes the input
06:42 jceb joined #git
06:44 jmpp why is the hooks PWD the .git dir? shouldn't it be the parent dir?
06:44 A1Recon joined #git
06:44 jmpp seems like an odd choice
06:45 A1Recon joined #git
06:45 milki the .git dir is the source of truth
06:45 A1Recon hey
06:45 milki the "parent dir" which you refer to as the worktree can be anywhere
06:45 thiago some of the hooks aren't meant for non-bare repos
06:45 jmpp yeah, true
06:45 milki but the .git dir must be known
06:45 thiago post-update is one of those
06:45 jmpp it can even not exist in the case of a bare repo
06:46 A1Recon If I want to set different email and author names for one local repo. How can I do that?
06:47 thiago A1Recon: git config user.name and user.email
06:47 jmpp all working now, post-update is indeed what I needed
06:47 jmpp thanks guys!
06:47 A1Recon So `git config` without the `--global` flag sets it for the local repo by default?
06:48 A1Recon thiago, ^
06:48 thiago correct
06:48 settermjd joined #git
06:48 netcarver joined #git
06:48 Assimilater left #git
06:49 C4ta|Work joined #git
06:49 encod3 joined #git
06:51 User458764 joined #git
06:51 jungsubk joined #git
06:51 david007 joined #git
06:51 jmpp without --global, git always acts at the repo level
06:51 jmpp you use --glboal to change that
06:51 A1Recon So say I have a directory named X and it has two directories X1 and X2. X1 is public on github. X2 isn't tracked yet. Can I put the entire X in a private repo?
06:51 LucaTM joined #git
06:51 Catachan_ joined #git
06:52 A1Recon So when I push the entire X it will be pushed to the private repo but just when I want I can push X1 to github publicly. Is this possible?
06:52 LucaTM left #git
06:53 nick1 left #git
06:55 thiago A1Recon: git refuses to add git repositories to repositories
06:55 espindola joined #git
06:55 thiago nested repositories show up as submodules
06:57 A1Recon thiago so companies or people who make parts of their code public. How do they do that?
06:59 Waskeend joined #git
07:00 boudiccas joined #git
07:01 aavrug joined #git
07:03 eijk joined #git
07:03 thiago A1Recon: they do it just fine
07:03 Oebele joined #git
07:03 thiago A1Recon: can you clarify what the problem is?
07:04 A1Recon thiago, I was just wondering how people keep certain parts of their code public.
07:04 thiago A1Recon: I don't see the issue
07:05 thiago A1Recon: put the code that they want to be public in a repo. Publish it.
07:06 A1Recon I found this blog here which talks about it in detail https://24ways.org/2013/keeping-parts​-of-your-codebase-private-on-github/
07:07 milki o hey a !blog
07:07 gitinfo Blog or Answer posts(like StackOverflow), while helpful and informative, are quite often outdated, give bad advice, or are just plain wrong. Please don't rely solely upon them, or treat them as authoritative. We recommend reading the documentation and consulting multiple sources, such as the expert advice to be found on IRC
07:07 A1Recon Thanks for the help thiago
07:07 a_thakur joined #git
07:07 milki that looks like just public and private branches
07:07 A1Recon yeah they are using different branches
07:07 milki yeah, nothing special there
07:08 milki pick and choose which branches get pushed to public remote
07:08 EvilDMP I'm doing a rebase; I fix a conflict, add, then --continue - but I'm informed that I have made no changes and may have forgotten to add! https://dpaste.de/ZTFp
07:08 milki a great way to accidentally publish the private branches
07:08 milki EvilDMP: what does git status stay?
07:08 EvilDMP most definitely, I haven't forgotten, and I really did edit the files
07:08 thiago EvilDMP: it's possible that your fix rendered the change empty
07:08 subhojit777 joined #git
07:08 milki EvilDMP: edit != add
07:08 jknetl joined #git
07:08 EvilDMP milki: (all conflicts fixed: run "git rebase --continue")
07:09 milki really? it says fixed?
07:09 * milki doens tremember that.
07:09 milki EvilDMP: if you fixed it so that there are no changes in the commit, then its safe to skip the commit
07:09 elastix joined #git
07:10 EvilDMP milki: well, there were conflicts to be resolved.
07:10 Lynxium joined #git
07:10 Catachan_ joined #git
07:11 milki EvilDMP: i dont understand. did you paraphrase the message so it is less accurate?
07:11 EvilDMP no, I copied that message from git
07:11 EvilDMP I resolved the conflicts, added the affected files
07:12 settermjd joined #git
07:12 EvilDMP at that point git seemed to think I had fixed something
07:12 milki EvilDMP: if there are no added/deleted/modified files listed, then the commit is empty
07:12 DieguezZ joined #git
07:12 milki and you need to explicitly skip the commit in order to continue
07:15 EvilDMP this is what I have after fixing the conflicts in the two files: https://dpaste.de/OjrD
07:15 dreiss joined #git
07:15 milki yeah, you have no changes that are brought in by this commit
07:15 milki its empty
07:15 milki you undid everything the commit did
07:15 EvilDMP so at this point, git rebase --skip?
07:15 moop joined #git
07:15 fullstack joined #git
07:15 milki yeah
07:16 xall_ joined #git
07:16 milki 3rd times the charm
07:17 EvilDMP Ah, OK, it looks like that operation was mopping up a small conflict, and now after the --skip it reveals some more meaty changes, including the ones I was expecting to see
07:17 EvilDMP thanks milki
07:17 dreiss joined #git
07:18 [Brain] joined #git
07:22 cqi joined #git
07:22 Sceorem joined #git
07:23 sagerdearia joined #git
07:24 clmsy joined #git
07:24 C4ta|Work joined #git
07:27 imjacobclark joined #git
07:29 Balliad joined #git
07:30 texinwien joined #git
07:31 ki0 joined #git
07:35 Hounddog joined #git
07:38 infra-red joined #git
07:38 Phylock joined #git
07:40 lmatteis joined #git
07:42 Fijit joined #git
07:42 cdown joined #git
07:45 testild joined #git
07:45 ntonjeta joined #git
07:45 subhojit777 joined #git
07:46 multi_io joined #git
07:47 cdown_ joined #git
07:49 ramsub07 joined #git
07:50 famous joined #git
07:50 jceb joined #git
07:50 famous left #git
07:53 ahmedelgabri joined #git
07:55 checkItO1t joined #git
07:55 mooru joined #git
07:56 espindola joined #git
07:56 fees joined #git
07:57 algun joined #git
07:57 algun joined #git
07:57 qt-x joined #git
07:58 fracting joined #git
08:02 nnyk_ joined #git
08:04 k3rn31 joined #git
08:04 garethdaine joined #git
08:06 moop joined #git
08:07 FrontPsych joined #git
08:11 eletuchy joined #git
08:12 barteks2x joined #git
08:13 lmatteis joined #git
08:14 kurkale6ka joined #git
08:15 dsdeiz joined #git
08:15 dsdeiz joined #git
08:16 foodSurprise joined #git
08:16 ocbtec joined #git
08:17 A1Recon joined #git
08:18 DieguezZ joined #git
08:18 aidalgol joined #git
08:19 wviana_ joined #git
08:19 encod3 joined #git
08:20 imjacobclark joined #git
08:20 Brain joined #git
08:21 aard joined #git
08:21 imjacobclark joined #git
08:22 Macaveli joined #git
08:25 marcogmonteiro joined #git
08:28 wwwald joined #git
08:28 Wind0r joined #git
08:29 CheckDavid joined #git
08:30 notebox joined #git
08:32 rolha joined #git
08:32 mischat joined #git
08:32 tvw joined #git
08:33 mischat joined #git
08:36 iota_pi joined #git
08:36 feignix joined #git
08:36 nilg` joined #git
08:38 peepsalot joined #git
08:41 dpower joined #git
08:42 tvw joined #git
08:42 bluezone joined #git
08:43 afuentes joined #git
08:44 kedare joined #git
08:45 acetakwas joined #git
08:48 fakenullie I wish scp could use proxies like tramp does
08:49 selckin what kind of proxies and why
08:49 a_thakur joined #git
08:49 fakenullie sorry, it was for emacs window
08:52 acetakwas joined #git
08:55 SimonNa joined #git
08:55 acetakwas joined #git
08:57 espindola joined #git
08:59 Raging_Hog joined #git
09:00 acetakwas joined #git
09:01 eletuchy joined #git
09:02 yxdjlr joined #git
09:08 feignix joined #git
09:12 qballer joined #git
09:13 acetakwas joined #git
09:16 mehola joined #git
09:17 ewet joined #git
09:18 gingitsune joined #git
09:19 gingitsune How do do i procceed if i cloned a remote repo but now want to create my own remote repo on a machine I own?
09:19 i7c On that remote do git init --bare myrepo.git
09:20 i7c On your local one do git remote add myrepo <repo-url (ssh for example)>
09:20 i7c git push myrepo <some ref>
09:20 flaviodesousa joined #git
09:20 i7c Or git push --all
09:20 acetakwas joined #git
09:23 alexander__b joined #git
09:23 alexander__b left #git
09:23 bernalex joined #git
09:23 bernalex joined #git
09:23 moei joined #git
09:24 checkItOut joined #git
09:24 sol56 joined #git
09:25 alexander__b joined #git
09:25 acetakwas joined #git
09:26 horse joined #git
09:27 cerkauskas joined #git
09:27 cerkauskas hello. i did commit with detached head. how can I clear that commit?
09:27 cerkauskas i didn't push
09:27 horse hi all.  i'm trying to clone a repo using passwordless ssh key, but it looks like git clone can't find my private key.  The user i'm logged in as has a non standard home dir under /var/username
09:27 horse is this why?
09:27 i7c You don't have to do anything really cerkauskas.
09:28 i7c cerkauskas, you can just checkout whatever other ref you want.
09:28 horse how do i get git to pick up this key
09:28 i7c horse, doesn't matter as long as the key is in $HOME/.ssh I guess?
09:29 horse i7c - yeah i thought so, but it dosnt seem to be picked up in there?
09:29 alexander__b joined #git
09:29 i7c horse, what remote URL did you use? You can make a host in the ssh config with the respective domain.
09:30 cerkauskas i7c: but there are no commits when I try to push. I think I should mention that I am in detached head state
09:30 alexander__b left #git
09:30 i7c horse, something like this: https://paste.xinu.at/AdiQ/
09:30 noodle joined #git
09:30 i7c cerkauskas, what do you mean by "clear" the commit exactly?
09:30 horse thanks i7c, i'll give that a go!
09:30 cerkauskas i7c: remove it completely from stash
09:31 acetakwas joined #git
09:31 cerkauskas and recommit
09:31 i7c Why would you try to push then? Seems counter-intuitive.
09:31 cerkauskas just to see what happens
09:32 i7c Okay, and I'm a bit more confused now, because you mentioned stash ;)
09:32 cerkauskas it could be that I am using stash term wrong
09:32 i7c Okay, so you were/are in detached head state and you made commits.
09:32 Arkreuz joined #git
09:32 cerkauskas yes
09:33 i7c If you want to "undo" those commits you can just checkout another version and possibly make a new branch there.
09:33 i7c Like git checkout -b mynewbranch origin/master (just an example ofc)
09:34 i7c Then you'd be on the version of the remote with a new branch and you could make changes as you wish and then possibly push them.
09:34 ahmedelgabri joined #git
09:34 i7c Those commits you did would just hang around for some longer and git will eventually garbage collect them.
09:34 jaguarmagenta joined #git
09:36 acetakwas joined #git
09:36 i7c cerkauskas, if you make commits while on a branch, that branch will afterwards point to the new version. Undoing such a commit may involve resetting the branch. But since you weren't on any branch, this is not necessary.
09:37 cerkauskas i7c: thank you :)
09:37 cdown joined #git
09:37 i7c you're welcome :)
09:37 texinwien joined #git
09:37 King_Hual joined #git
09:37 King_Hual joined #git
09:38 Chulbul joined #git
09:38 cerkauskas by the way, for the purpose of learning, why you got confused when I mentioned stash? Am I using this term wrong? According to my knowledge, it is local repository changes
09:39 i7c git stash is a tool to save changes but it is different from commit.
09:39 i7c !man git-stash
09:39 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
09:39 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
09:39 Chulbul any idea about this issue: org.eclipse.jgit.errors.LockFailedException: Cannot lock F:\wamp\www\cdev\remote\cdev55\web-app\.git\index
09:39 Chulbul how can i resolve it
09:39 romerocesar joined #git
09:41 acetakwas joined #git
09:41 i7c cerkauskas, what you stash with git stash is not meant to be shared, it's not part of the git history.
09:42 cdown joined #git
09:43 fracting joined #git
09:43 acetakwas joined #git
09:44 eletuchy joined #git
09:46 acetakwas joined #git
09:49 imjacobclark joined #git
09:50 bruce_lee joined #git
09:50 romerocesar joined #git
09:51 acetakwas joined #git
09:54 lordjancso joined #git
09:56 acetakwas joined #git
09:57 przemoc joined #git
09:57 ahmedelgabri joined #git
09:58 espindola joined #git
09:59 Chill_Surf joined #git
10:00 jbitdrop joined #git
10:01 acetakwas joined #git
10:05 Sceorem joined #git
10:05 gingitsune i7c: thanks, git inite --bare worked out
10:06 acetakwas joined #git
10:06 gingitsune When i see a pull request like so https://github.com/OCA/OpenUpgrade/pull/530/co​mmits/5bb2a74bd8d65bc073eeb577995f78137aa87dc7
10:07 gingitsune Is the source repo, publicly available
10:08 gingitsune I click on the user making the pull request and the users fork doesn't show the branches in the PR
10:09 mooru joined #git
10:10 hrob joined #git
10:10 hrob hi
10:10 gitinfo hrob: 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.
10:10 checkItO1t joined #git
10:10 lindenle joined #git
10:11 circ-user-aKdA0 joined #git
10:11 hrob I've been asked to squash my feature branch to a single commit before pushing to remote
10:11 acetakwas joined #git
10:12 hrob I'm not sure if this is possible with git -- I see some suggestions with  git commit-tree
10:12 hrob and reset
10:12 hrob does anyone have a good suggestion for me
10:13 hrob I know I have to do 1) pull 2) rebase 3) squash 4) push to remote
10:13 ToBeCloud joined #git
10:13 cbreak hrob: git merge --squash otherbranch
10:13 achadwick joined #git
10:14 babyswizz joined #git
10:14 hrob cbreak:  ok so  you suggest I create a final feature branch    git checkout -b "final"
10:14 cbreak no
10:14 hrob followed by git merge --squash
10:15 cbreak merge into the branch you want the squashed commit to end up
10:16 hrob cbreak:  ok sorry to be slow -- so Im in my feature branch right now --- I simply go   git merge --squash "mycurrentbranchname"
10:16 cbreak no
10:16 cbreak you go to which ever branch you want it to end up in
10:16 cbreak then you merge it
10:16 cbreak the current branch obviously already has all the changes
10:16 hrob cbreak:  right
10:16 cbreak so the merge would do nothing at all
10:16 hrob cbreak:  ok so I think I got you the first time
10:17 acetakwas joined #git
10:17 icio joined #git
10:17 mehola joined #git
10:17 hrob cbreak:   before pushing to remote I want to package everything into a single commit on a new branch if I prefer
10:17 sdothum joined #git
10:18 babyswizz I am still new to git, and have been trying to add some python files to the staging area with the "git add '*.py'" command but I get the error fatal: pathspec ''*.txt'' did not match any files message
10:18 babyswizz not sure what I did wrong guys
10:19 hrob cbreak:  so   1) checkout master 2) pull 3) git checkout my final feature 4) git merge --squash original_feature_branch
10:19 hrob cbreak:  now I have a branch that is single commit based off latest master
10:20 cbreak babyswizz: well, do you have a file with that name?
10:20 acetakwas joined #git
10:20 cbreak it is weird that it says .txt even though you typed .py
10:22 hrob cbreak:   I suppose I could look at my local master as my final feature too ---
10:27 babyswizz cbreak: That was a mistake by me, I tried adding both files with .txt and .py file extension and on the occasion of .txt it gave the error i pasted above
10:28 basiclaser joined #git
10:29 babyswizz This was the error it gave for the command I posted earlier fatal: pathspec ''*.py'' did not match any files
10:33 LeMike joined #git
10:33 JeroenT joined #git
10:36 a3Dman joined #git
10:37 hrob cbreak:   I found another suggestion to interactively squash using     git rebase -i start_hash
10:37 ocbtec joined #git
10:37 acetakwas joined #git
10:37 Ravana joined #git
10:37 JRHaigh joined #git
10:38 eletuchy_ joined #git
10:39 aguimaraes1986 joined #git
10:39 icio joined #git
10:40 interne7y joined #git
10:40 leandrosansilva joined #git
10:41 eletuchy joined #git
10:42 cbreak babyswizz: well, does it?
10:43 User458764 joined #git
10:43 eletuch__ joined #git
10:43 acetakwas joined #git
10:43 d0nn1e joined #git
10:44 cbreak are there any files which match the pattern?
10:44 interne7_ joined #git
10:44 cbreak hrob: there are dozens of ways to do it
10:45 eletuchy_ joined #git
10:45 leandrosansilva joined #git
10:46 babyswizz cbreak: yes, I have files ending with both .py and .txt in the directory
10:47 cbreak are they ignored?
10:47 eletuchy joined #git
10:49 eletuch__ joined #git
10:50 Ravana joined #git
10:50 eletuchy_ joined #git
10:52 Raging_Hog joined #git
10:52 netj joined #git
10:52 eletuchy joined #git
10:52 barteks2x joined #git
10:53 cdown joined #git
10:54 rnsanchez joined #git
10:59 espindola joined #git
11:00 acetakwas joined #git
11:01 inflames joined #git
11:02 acetakwas joined #git
11:02 mikecmpbll joined #git
11:03 babyswizz cbreak: How do I know if they are ignored
11:03 cbreak do they show up in git status?
11:04 cbreak if they contain changes, or are untracked and not ignored, they should
11:05 acetakwas joined #git
11:06 johnmilton joined #git
11:11 ahmedelgabri joined #git
11:12 icio joined #git
11:12 rvsjoen joined #git
11:12 Chulbul I just removed index.lock file and everything seems to work.
11:12 dopesong joined #git
11:13 fuchstronaut joined #git
11:14 artemisart joined #git
11:15 sol56 joined #git
11:15 acetakwas joined #git
11:17 OliverJAsh joined #git
11:18 mehola joined #git
11:18 fuchstronaut joined #git
11:18 sgen joined #git
11:20 acetakwas joined #git
11:22 acetakwas joined #git
11:25 rahtgaz joined #git
11:26 Codfection joined #git
11:27 OliverJAsh left #git
11:28 Macaveli joined #git
11:28 astrofog joined #git
11:28 acetakwas joined #git
11:30 Arsonide joined #git
11:30 digidog joined #git
11:31 artemisart joined #git
11:32 acetakwas joined #git
11:33 Ediz joined #git
11:33 ramsub07 joined #git
11:33 acetakwas joined #git
11:34 icio joined #git
11:34 trudko joined #git
11:35 jaguarmagenta joined #git
11:35 trudko Hi everyone, one thing which confuses me why in some git commands -- is used before path to file , in some cases there is whitespace and git show has :  between file and branch
11:36 mdw joined #git
11:36 lss8 joined #git
11:36 selckin revision:file => file from that revision, -- is disambiguate, i mean sha or file name not the other
11:36 acetakwas joined #git
11:37 grawity some commands accept a single 'object' parameter
11:37 grawity which can be a commit, a tree, a file in that commit's tree, or whatever
11:37 radsy joined #git
11:37 grawity other commands accept specifically a few commits + a few files
11:38 grawity and -- means "everything from now on is going to be a file name, not a weird branch name"
11:38 grawity it's optional but otherwise git has to try branch names *and* file names
11:39 armyriad joined #git
11:40 shinnya joined #git
11:42 acetakwas joined #git
11:42 irco joined #git
11:42 ShapeShifter499 joined #git
11:42 t0by joined #git
11:43 espindola joined #git
11:47 acetakwas joined #git
11:47 nnyk_ joined #git
11:51 dsdeiz joined #git
11:51 ramsub07 joined #git
11:51 gechr joined #git
11:52 TomyWork joined #git
11:52 djb-irc joined #git
11:54 dopesong joined #git
11:54 acetakwas joined #git
11:55 foo357 joined #git
11:57 acetakwas joined #git
11:57 ediz_ joined #git
11:59 trudko grawity: selckin seems like you two are contradicting about -- is -- file name or it is disambuguate?
11:59 grawity never said it's a "file name"
11:59 cyan__ joined #git
11:59 grawity it's the disambiguation separator between commit names and file names
11:59 Sceorem joined #git
12:00 fmcgeough joined #git
12:00 FuzzySockets joined #git
12:01 JeroenT joined #git
12:02 acetakwas joined #git
12:02 cdown joined #git
12:02 rnsanchez joined #git
12:03 selckin like you could have a file name foo and a branch name foo
12:03 rolha joined #git
12:04 k3rn31 joined #git
12:04 fuchstronaut joined #git
12:04 trudko so after -- can be only file name?
12:05 selckin yes
12:06 trudko ok after  : separates  revision and file
12:07 trudko and white space ?
12:07 selckin it's file from that revision
12:08 ahmedelgabri joined #git
12:09 fuchstronaut joined #git
12:09 trudko why even bring up different separators?  is it based on some existing system or it is purely git based?
12:10 grawity because they separate completely different things, syntax-wise
12:10 selckin -- is pritty standard across tools for a similar meaning
12:10 selckin : is fairly specific
12:11 synthroid joined #git
12:15 trudko couldn't there be only one separator like -- ?
12:15 rgrinberg joined #git
12:16 grawity no, because then you couldn't have a way to specify a commit+path as a single argument
12:17 zumba_addict joined #git
12:17 trudko how so? you could treat first argument as file second as commit and / or add explicit parameter names
12:18 selckin just accept it, not gonna change, move on with life
12:18 grawity but that'd be inconsistent
12:18 alexsystemf__ joined #git
12:19 grawity you went from two separators, to having two syntaxes for "file in a commit" and "other kinds of objects"
12:20 allcentury joined #git
12:21 jeffreylevesque joined #git
12:24 Blkt joined #git
12:25 rgrinberg joined #git
12:26 charllie joined #git
12:28 wviana joined #git
12:29 danchr left #git
12:32 bittin joined #git
12:34 icio joined #git
12:36 rkazak joined #git
12:38 liquidjamm joined #git
12:39 aard joined #git
12:39 imjacobclark joined #git
12:40 JeroenT joined #git
12:41 foo357 Hello. I'm working on a codebase together with another person (Bob). There's not any big differences between our two versions. I'm trying to rebase my code upon Bob's code but I'm getting an deletion conflict.
12:41 romerocesar joined #git
12:42 foo357 One thing I did was to remove two files that weren't necessary. But Bob recently synched (rebase against me) and have this change.
12:43 foo357 So when I attempt to do a rebase against Bob I get a deletion conflict where git is having some trouble with a totally unrelated file.
12:44 foo357 Any ideas how this can be fixed?
12:45 selckin hard to follow
12:47 Rodya_ joined #git
12:47 tobiasvl foo357: !eek
12:47 gitinfo foo357: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
12:51 foo357 When I run 'git mergetool' during rebasing I get the printout: "Deleted merge conflict for 'somefile.txt' " {local} : created file {remote} : deleted
12:51 semantip_ joined #git
12:51 foo357 ... so if I choose (c)reated I would go with the existing file then?
12:54 toogley joined #git
12:54 liuzhen joined #git
12:54 semantip_ joined #git
12:54 italoacasas joined #git
12:55 Ricaz joined #git
12:55 PoppaWork joined #git
12:56 Ricaz If a repo has config files in it, and I want to edit those but keep being able to update the rest of the files, what would be the best way of doing this?
12:56 tobiasvl Ricaz: !config
12:56 gitinfo Ricaz: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
12:57 PoppaWork ok, so i commited and pushed to github 16 hours ago, shows in in github, i come to work today to pull in the changes from home last night and shows that its already up to date, i check the local repo files and appears its not up to date .. what should i do ?
12:57 cqi joined #git
12:58 Bennux joined #git
12:58 Ricaz tobiasvl: thank you
12:58 tobiasvl PoppaWork: are you pulling the right branch?
12:58 tobiasvl PoppaWork: !repro
12:58 gitinfo PoppaWork: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
13:00 PoppaWork https://gist.github.com/poppabear88​83/41d0982128404b51f7f3de790dcb1c59
13:02 abec0 joined #git
13:02 PoppaWork and yes, when i go to github and check the master branch (which is the only branch i have atm) it reflects the commit from 16 hours ago
13:02 tobiasvl PoppaWork: git rev-parse HEAD && git rev-parse FETCH_HEAD
13:02 tobiasvl PoppaWork: hang on. why do you write "git pull origin master" instead of just "git pull"?
13:02 jimi_ joined #git
13:03 tobiasvl are you not on master?
13:03 nnyk_ joined #git
13:03 PoppaWork just the way i always have done it, didn't think it made any difference, and yes i am on master
13:03 PoppaWork https://gist.github.com/poppabear88​83/55ba69072454e4889e6490ee9f7ae73d
13:03 tobiasvl ok. doesn't make any difference then.
13:04 uhmgswa^2 joined #git
13:04 PoppaWork i just like to be explicit to be certain i know what i am pulling in :P
13:04 tobiasvl PoppaWork: well, that latest gist shows that you have the latest commit, so
13:04 tobiasvl sounds like you're good to go
13:04 PoppaWork yea i wonder why my local files don't show the changes from the commit
13:04 PoppaWork and i certainly have not pulled in the commit from last night
13:05 tobiasvl you clearly have, since HEAD -> master -> d99a79d which is the same commit as on github
13:05 tobiasvl as for why your files don't show the changes: git status
13:05 PoppaWork yea, its odd, will look into it further
13:06 PoppaWork Your branch is up-to-date with 'origin/master'.
13:06 PoppaWork yea, i'll look into it a bit further
13:08 _ikke_ PoppaWork: The behaviour of git pull origin master changed a while ago
13:08 _ikke_ PoppaWork: On older versions, that way of pulling would not update remote tracking branches
13:09 semantipc joined #git
13:09 hrob hi
13:09 PoppaWork tobiasvl: i must still be asleep or something, the files do have the changes, but the strange thing is that when i got to work, it was already up to date with the push from home last night
13:09 PoppaWork lol
13:09 phanimahesh joined #git
13:09 hrob my rebase from master cause a small conflict
13:09 CEnnis91 joined #git
13:10 Macaveli joined #git
13:11 mbrzuzy joined #git
13:12 grassass joined #git
13:13 SirOliver joined #git
13:13 tobiasvl PoppaWork: soooo... did you work remotely on your workplace computer yesterday? :P
13:14 PoppaWork nope
13:14 PoppaWork lol, its whatever
13:14 PoppaWork if you say its good then its good
13:14 crose joined #git
13:14 PoppaWork if i have to i will remove local and clone again
13:14 PoppaWork but i think its ok
13:15 phanimahesh joined #git
13:15 dan2k3k4 joined #git
13:18 PoppaWork tobiasvl:  i just realized, the last commit was from the terminal 17 hours ago, i actually had nothing to commit last night at home,  so i never pushed anything from home ... i need more coffee .. thanks for your help
13:19 PoppaWork "this terminal"
13:19 superrorc Hi there!
13:19 superrorc how can i specify user and mail for current repo localy
13:19 superrorc like git config --local user.name "Super Master"
13:19 tobiasvl PoppaWork: aha, haha, that'd explain it
13:19 grawity superrorc: that's already the default
13:19 superrorc but its doesnt work
13:20 tobiasvl superrorc: yes like that
13:20 grawity all options are local unless you specify --global
13:20 PoppaWork wait i lied
13:20 superrorc user and mail already seted up with --global
13:20 tabrez joined #git
13:20 tobiasvl superrorc: local trumps global
13:20 superrorc git config user.name "Super Master" ? in repo
13:21 PoppaWork wtf i am super confused now, i did push something from home but its not showing up on github ...
13:21 PoppaWork odd
13:21 tobiasvl then perhaps the push failed
13:22 tobiasvl hard to say without you sitting at your home computer
13:22 tobiasvl superrorc: yes
13:22 romerocesar joined #git
13:22 PoppaWork tobiasvl:  in my terminal from home last night, when i pushed i noticed something weird with it the terminal showed {master}{hg}
13:22 tobiasvl superrorc: or with --local, like you said first. doesn't matter
13:22 M-kegan21 joined #git
13:22 PoppaWork what could that hg mean
13:22 fracting joined #git
13:22 tobiasvl hg is another vcs, similar to git
13:23 tobiasvl called mercurial
13:23 tobiasvl other than that, no clue
13:23 superrorc works without --local, thanks =)
13:23 M-kegan21 left #git
13:23 PoppaWork hmm will have to wait till i get home then i guess
13:24 axiom_1 joined #git
13:27 cdesai joined #git
13:29 nettoweb joined #git
13:29 cuebix-wk joined #git
13:29 tesuji joined #git
13:29 ShekharReddy joined #git
13:30 gajus I see different commits when I do `git log --pretty=oneline -10` and `git rebase -i HEAD~10`
13:30 gajus whats the difference between the two?
13:30 ash_workz joined #git
13:30 ahmedelgabri joined #git
13:31 phanimahesh gajus: They should be the same. Both show the first line of commit message
13:31 phanimahesh afair
13:32 T4nk5bb0t joined #git
13:32 gajus I am silly
13:32 gajus sorry
13:32 gajus forgot that in git rebase commits are listed in ascending order
13:33 phanimahesh gajus: not ascending, they are listed in chronological order
13:33 phanimahesh or to be more precise, the order in which they appear when traversing the commit tree
13:34 AaronMT joined #git
13:34 phanimahesh s/tree/graph
13:34 isxek joined #git
13:34 BigWillie joined #git
13:34 grawity topological order
13:34 phanimahesh Aye. thanks.
13:35 grawity it's partly because rebase flattens merges by default, I guess
13:35 grawity regular `git log --graph` has both kinds of sorting
13:36 jaguarmagenta joined #git
13:37 cdesai joined #git
13:37 newlifer_ joined #git
13:37 sanketdg joined #git
13:39 fuchstronaut joined #git
13:39 ahmed_elgabri joined #git
13:42 oarg7 joined #git
13:43 uhmgawa^3 joined #git
13:43 piroko_ joined #git
13:44 Gsham joined #git
13:45 piroko We moved our source code from another tool to git at version 9 of our code, and now we need to do some fixes on version 8. Is there a logical/non-painful way to pull this into git (assuming we're fine with re-writing history)?
13:45 piroko My initial idea was to insert version 8 below version 9 (make it our new root commit), but I wasn't sure how to handle updating the dozens of branches we have off of master
13:46 jhass so you didn't import history? Why not?
13:46 Dougie187 joined #git
13:46 piroko We tried. Unfortunately the tool we used (Surround SCM) has a _TERRIBLE_ api that had tons of behavior that prevented us from doing so
13:47 piroko We wrote a huge script to attempt the import, but the way that surround handled deleted files made the task more trouble than it was worth
13:48 osse you could at least have made 9 commits out of versions 1 to 9 :p
13:48 piroko If you delete a file at version 8, you can't access versions 1-7 of the file through their API without first undeleting the file. It's a mess
13:48 piroko osse: True. Hindsight is 20/20. We didn't expect to have to go back to version 8 ever
13:48 piroko Customer needs changed
13:49 osse talk to legal and tell them fixing this for the customer costs more than violating your contract. problem solved
13:49 uhmgawa joined #git
13:49 Ahmed90 joined #git
13:49 piroko lol...
13:49 soLucien joined #git
13:49 osse how many commits do you have in the repo now?
13:49 jhass piroko: you don't actually need to associate the versions then, right?
13:50 jhass piroko: I would recommend to start a new history for version 8 altogether
13:50 piroko osse: 439
13:50 osse ah, yes. maybe just make a "version8.git" repo
13:50 jhass or git checkout --orphan release/8
13:50 ifsp joined #git
13:50 osse piroko: in that case the tool of choice would be git-replace follwoed by git-filter-branch
13:50 jhass --orphan -b
13:51 soLucien is there any approach to having a file in a git repository, but ignoring changes to it ? I have a file like this: https://gist.github.com/blanoz/8​886524dc94571e06a89227265e3e8c8
13:51 piroko jhass: We probably don't need to associate them. Creating an orphan branch is more than likely our best bet
13:51 GyrosGeier joined #git
13:51 GyrosGeier hi
13:51 soLucien i want every developer to change it with machine-specific information that he will never share
13:51 GyrosGeier I have a branch with a lot of merge commits to resync to master
13:51 GyrosGeier is there a way to rebase it so the merge commits go away?
13:51 soLucien it should be in the project , because it serves a template
13:52 soLucien as a template *
13:52 soLucien htey put in their username and pass in it, and they're set to go.
13:52 soLucien what approach should i use ? I have added it to .gitignore
13:54 soLucien changes still show up in git
13:54 osse piroko: git-replace can be used to tell "pretend this commit is the parent of that commit" and stuff like that. git-filter-branch can be used to make that permanent
13:55 User458764 joined #git
13:56 osse so if you want graft versions 1 to 8 into the "bottom" of the repo then this is the way to go. but people have to re-clone or fetch and rebase and blah blah to make sure etc etc. So back how much violating that contracts costs you... :P
13:56 acetakwas joined #git
13:56 piroko heh yeah. Thank you. I think the orphan branch solution is simpler. I can't see us having to merge the 2 lines of development together the more I think about it
13:56 ntonjeta joined #git
13:56 cdesai joined #git
13:57 osse that's what you said about working on version 8 back then too :p
13:57 d0nkeyBOB joined #git
13:57 Asiajey joined #git
13:58 semantipc joined #git
13:58 osse that's what you said about working on version 8 back then too :p
13:58 osse oops
13:59 phaleth joined #git
13:59 kaldoran joined #git
14:00 diogenese joined #git
14:00 pothepanda joined #git
14:02 guardianJ joined #git
14:04 PoppaWork ok, so if i am certain that everything on my staging server is up to date with what i want pushed to github, but i have not pushed from the staging server in some time now, i did 'git add .' and 'git commit -m message' , but when i try and push i get https://gist.github.com/poppabear88​83/3bd5c52824779e085863153367a66fa3 but lets pretend i don't car
14:04 PoppaWork e whats on github atm, and want to force the push ?
14:05 PoppaWork and will that create issues with pulling in those changes from github
14:05 sangy joined #git
14:08 ResidentBiscuit joined #git
14:08 semantipc joined #git
14:09 cordova joined #git
14:10 cdg joined #git
14:12 GodGinrai joined #git
14:13 lindenle joined #git
14:13 GodGinrai Would this be the correct place to ask about irregularities with git for windows?
14:14 qsx GodGinrai: no, that’s obviously in #subversion
14:14 qsx yes it is.
14:14 GodGinrai lol
14:15 GodGinrai So, I'm seeing a weird problem with a git-hook I wrote when on a coworker's computer.
14:15 GodGinrai this is on Windows 7... when in the hook, `pwd` is returning a Windows filepath
14:16 ResidentBiscuit That's what pwd does
14:16 GodGinrai even tho' git bash and docker quickstart terminal (the 2 places we tried to run it from) both returned a unix-style path (/c/users/...) when using `sh -c 'pwd'`
14:16 cdesai joined #git
14:17 GodGinrai ResidentBiscuit: yea, but I mean it is returning the C:\Users\... nonsense
14:17 uhmgswa^2 joined #git
14:17 mdw joined #git
14:18 k3rn31 joined #git
14:19 GodGinrai Can someone explain why it is returning a windows-style filepath and how to remedy this?
14:19 ResidentBiscuit I have no clue here
14:21 LionsMane joined #git
14:21 mmlb joined #git
14:21 mehola joined #git
14:21 ResidentBiscuit I dont think pwd is even a command in windows by default. Wonder if you have an alias for it. I imagine git-hook runs in the windows environment, and not the git bash environment. But im totally guessing here
14:23 GodGinrai ResidentBiscuit: From what I can find in my google searches, the git-hooks will be run in msysgit's port of bash
14:24 semantipc joined #git
14:25 treehug88 joined #git
14:25 fujinuma joined #git
14:25 ediz_ joined #git
14:28 CheckDavid joined #git
14:30 heftig there's no command to automatically clean up .git/modules, is there?
14:31 gechr joined #git
14:31 M-sbts joined #git
14:33 Repox joined #git
14:34 qsx heftig: rm -rf
14:36 allcentury joined #git
14:37 User458764 joined #git
14:38 fracting joined #git
14:40 shams joined #git
14:40 ki0 joined #git
14:44 M-shine joined #git
14:44 M-mistake joined #git
14:44 M-meznak joined #git
14:45 crose joined #git
14:47 fujinuma left #git
14:50 SimonNa joined #git
14:51 zivester joined #git
14:51 kpease joined #git
14:53 hashpuppy joined #git
14:53 SirOliver joined #git
14:53 d0nkeyBOB joined #git
14:54 ochorocho__ joined #git
14:55 Macaveli joined #git
14:57 segment-fault joined #git
14:58 diegoaguilar joined #git
14:58 hunt joined #git
14:59 dignmg joined #git
15:00 hunt Hi, I'm trying to cherry pick some commits from an old branch onto a newer branch. Using git cherry-pick doesn't work as it tries to modify code unrelated to the commits (such as changing function definitions to match those of the earlier branch). Is there a way for me to apply the commits and tell git to only cherry-pick the code from the commits I want?
15:00 hunt Such as how git apply only applies what is in the patch
15:01 Bennux joined #git
15:01 eletuchy joined #git
15:01 hunt I tried using git cherry-pick, git reset and then git add -p - but I want to retain the commit information
15:01 jast something's wrong if cherry-pick brings in changes that aren't in the commit you're picking
15:02 cdg joined #git
15:02 hunt jast: That's what I was thinking
15:02 hunt I'm on my upstream branch and then run git cherry-pick <SHA from older branch>
15:02 f3r70rr35f joined #git
15:02 |2321 joined #git
15:03 hunt The branches are from different remotes, if that makes any difference
15:03 Ranhir joined #git
15:03 GodGinrai hunt: yea, if you read the manpages, it is supposed to only introduce the changes made by the commit you cherry-picked.  Are you sure that those changes weren't part of the commit?
15:03 ahmed_elgabri joined #git
15:04 bango2 joined #git
15:04 PaulCapestany joined #git
15:04 tyreld joined #git
15:05 Bennux joined #git
15:05 hero616 joined #git
15:05 wvxtdg joined #git
15:05 digitalpeer joined #git
15:06 hunt I'm just rechecking...
15:06 blahdodo joined #git
15:06 spriz joined #git
15:07 hero616_ joined #git
15:08 ojacobson git cherry-pick is a lot like `git show <hash> | git apply` so
15:08 hunt Ah, I was wrong and git was right :P
15:08 ojacobson :D
15:08 Tim-SEM joined #git
15:08 hunt When I looked back at the diff, lines that were added and removed were mixed in so it looked like extra code had been pulled in
15:08 hunt Sorry for the noise, but thanks for the help
15:08 jason237 joined #git
15:09 SirOliver joined #git
15:09 uhmgawa^3 joined #git
15:10 sapiens_vector joined #git
15:10 semantipc joined #git
15:11 GodGinrai np
15:11 SirOliver joined #git
15:13 subhojit777 joined #git
15:13 subhojit777 joined #git
15:13 hunt left #git
15:13 subhojit777 joined #git
15:14 subhojit777 joined #git
15:14 subhojit777 joined #git
15:14 lxleuser joined #git
15:15 Maroloccio joined #git
15:16 Spacew00t joined #git
15:19 spriz joined #git
15:20 select0r joined #git
15:21 eight58 joined #git
15:22 cqi joined #git
15:23 romerocesar joined #git
15:24 select0r I'm finding that a few files in my .gitignore (thus not in my index) are disappearing every time I do a [checkout branch_2, pull, checkout orig, merge]. Can anybody tell me what might be happening to cause that?
15:24 ojacobson they're tracked
15:25 ojacobson also, that's a weirdly verbose way of merging origin/branch_2 into orig.
15:25 jast I can see why you'd do it that way
15:26 b1tchcakes joined #git
15:26 select0r They're tracked? They don't show up under git-status though.
15:26 select0r ojacobson: i'm certainly open to learning more concise ways of doing things, too
15:26 ojacobson if you specifically need to merge to branch_2 first, then that makes some sense
15:26 astrofog joined #git
15:27 dopesong joined #git
15:27 ojacobson otherwise, I'd use `git fetch origin && git merge origin/branch_2`
15:27 ojacobson tracked: git ls-tree -r orig, git ls-tree -r branch_2
15:27 fuchstronaut joined #git
15:27 ojacobson see if the affected files appear in eiher list
15:27 ojacobson either
15:28 dopesong joined #git
15:28 thiago_ joined #git
15:28 select0r ahah. Tracked in branch_2.
15:29 CJKinni joined #git
15:29 TomyLobo joined #git
15:29 select0r So is it a git rm --cached then?
15:30 lasko joined #git
15:31 durham joined #git
15:33 Alienpruts joined #git
15:34 _ikke_ yes
15:34 select0r Thanks folks for all the help!
15:34 ntonjeta joined #git
15:35 Noldorin joined #git
15:35 synthroid joined #git
15:35 allcentury joined #git
15:37 jaguarmagenta joined #git
15:39 fracting joined #git
15:39 SirOliver joined #git
15:43 madewokherd joined #git
15:44 al-damiri joined #git
15:44 icio joined #git
15:47 d0nkeyBOB joined #git
15:48 nitin joined #git
15:48 sharpy joined #git
15:49 peem joined #git
15:49 irco joined #git
15:52 ash_workz can you search the history for a commit that may have been made on a particular branch but some time ago?
15:52 GodGinrai ash_workz: of course
15:52 ash_workz GodGinrai: how do you do that?
15:52 peem I have a repo that needs certain things happening on every commit, like "puppet module build" for example. I thought that I can add it to pre-commit hook, but it seems to be false logic, as I need to do git add first, then run that again in hook script to cover new files generated by puppet. Is there a better vay of doing such thing ?
15:52 GodGinrai ash_workz: how are you wanting to search?
15:53 TankAbb0t joined #git
15:54 ilmari slightly off-topic: does anyone know if I can find a diff config (xfuncname, wordRegex) for scala?
15:54 ash_workz GodGinrai: so like, locally I was on branch Foo; the server was on Bar; I was like, "Oh I haven't merged those changes.... but wait... did I merge Foo even?" so I want to see if the latest commit on Foo exists on master
15:55 ilmari s/if/where/ # doh
15:56 GodGinrai ash_workz: if you have the commit hash, then you could just use `git show <commit_hash>`
15:56 GodGinrai ash_workz: if you see changes, it's there.  If you get an error, it's not.
15:57 GodGinrai oh wait
15:57 GodGinrai nvm
15:57 ash_workz GodGinrai: oh! so simple; get the has from Foo, and switch to master and then do `git show <hash>`
15:57 GodGinrai that doesn't care on if it is in master or not
15:57 ash_workz ...
15:57 ash_workz really?
15:57 GodGinrai yea
15:57 GodGinrai just a sec
15:57 GodGinrai it's still possible, just not w/ git-show
15:59 GodGinrai ash_workz: try `git log -n 1 <commit_hash>` on the branch you want to check
16:00 ash_workz on master ?
16:00 GodGinrai if you are checking if the commit is in master, yes
16:00 ash_workz hmm...
16:01 ash_workz I actually expected it not to find the hash
16:01 ash_workz any yet it did
16:01 ash_workz :\
16:01 User458764 joined #git
16:01 ash_workz oh well
16:01 ash_workz I guess I committed it
16:01 ash_workz (merged it rather)
16:01 GodGinrai lol
16:01 LeBlaaanc joined #git
16:01 ash_workz which is unfortunate because in the mean time I've been re-merging it in again
16:01 mikecmpbll joined #git
16:01 akushner joined #git
16:03 ash_workz dunno if that made any weirdness... what do I do to roll back 1 commit just in case?
16:03 GodGinrai ash_workz: additionally, I just remembered you can check which branches are already merged into HEAD with `git branch --merged`
16:04 GodGinrai git reset --hard HEAD~1 should rollback one commit
16:04 Heisenberg1276 joined #git
16:04 GodGinrai HEAD~1 means the commit before HEAD
16:04 ash_workz GodGinrai: yeah, but if you have merged once, then the branch will show right?
16:05 ash_workz GodGinrai: like, if you merge, and then make more commits to the same branch it will show when really there have been changes that haven't been merged, right?
16:05 ash_workz GodGinrai: a hard reset doesn't result in the destruction of the latest commit, does it?
16:06 bittin joined #git
16:06 GodGinrai ash_workz: I'm not sure about if you have unmerged and merged commits in a branch...
16:07 horse joined #git
16:08 ediz_ left #git
16:08 texinwien joined #git
16:08 eight58 joined #git
16:09 kus joined #git
16:10 kpease_ joined #git
16:11 ToBeCloud joined #git
16:11 GodGinrai ash_workz: It won't destroy it, but since nothing will point to it, it should be able to be deleted using git-gc
16:12 ash_workz GodGinrai: I should probably delete some of these branches that have been merged in
16:12 ash_workz GodGinrai: is that a bad idea?
16:13 GodGinrai ash_workz: I always delete branches after I merge them
16:14 romerocesar joined #git
16:14 ash_workz :)
16:14 ash_workz GodGinrai: thanks for your help
16:16 sentriz joined #git
16:16 ash_workz I think irc is a bit of a refreshing concept... I dunno... I've been becoming more and more cynical lately thinking people don't care about other people unless it benefits them. But then I think, "why would there be so many people on IRC helping each other?" which I think is nice, but then sometimes you get someone who is incredibly irritable, like they're being *forced* to help people on...
16:16 ash_workz ...IRC and so I start thinking cynically again
16:17 ash_workz GodGinrai: why do you help people on #git ?
16:17 taylorm joined #git
16:17 lindenle joined #git
16:17 jast I'm in it for the mountains of money
16:18 ojacobson it's a condition of my parole
16:18 LeBlaaanc joined #git
16:18 tomog999 joined #git
16:18 ash_workz ojacobson: !!! <3
16:18 DieguezZ joined #git
16:18 ojacobson :)
16:18 ash_workz this is kind of humor keeps me alive
16:19 liuzhen joined #git
16:19 * jast stage whispers: ojacobson thinks he's actually gotten out
16:20 horse joined #git
16:21 Arsonide joined #git
16:22 NaN joined #git
16:22 NaN hi there
16:23 _ikke_ ohai
16:23 NaN if I do > git mv file newpath/file << when I do merge from master and that file is changed, why does it say I deleted and not update the file to the new location?
16:24 jast hmm, do we have a thingy to answer that? !rename
16:24 gitinfo git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also http://thread.gmane.org/gmane.comp​.version-control.git/27/focus=217 and `diff.renames = true`  in man git-config
16:24 jast yeah, we do
16:24 _ikke_ alrighty
16:25 Joel joined #git
16:25 NaN damn so now I need to track manually all changed files in master until I merge to it
16:25 NaN :/
16:25 durham joined #git
16:25 Joel how can I tell at what revision a branch was created? or, how can I reset hard a branch back to when it was first created?
16:26 _ikke_ Joel: Do you know the branch it was created from?
16:27 Kallis joined #git
16:27 _ikke_ NaN: Why do you need to track them?
16:27 cyan__ joined #git
16:29 Joel _ikke_, yes, from and to, basically, I have a bunch of messed up merges, etc. so I want to reset back to a known point, then pull upstream, then apply my changes, clean up the log.
16:30 mbrzuzy joined #git
16:30 _ikke_ git merge-base <base> <branch> will tell you the merge base
16:32 Joel _ikke_, awesome, thanks.
16:32 romerocesar joined #git
16:34 horse joined #git
16:36 D-Nizzle joined #git
16:36 piling joined #git
16:36 jimi_ joined #git
16:37 vuoto joined #git
16:37 njbair joined #git
16:39 jimi_ joined #git
16:39 dsdeiz_ joined #git
16:42 NaN _ikke_: I'm moving and making global changes, so I thought 'git mv' would be sufficent for tracking but now I see it isn't
16:42 NaN suppose I need to do fetch-merge instead pull
16:43 hlysig joined #git
16:43 efdetonator joined #git
16:44 NaN is there any way to do merge interactive? like see what I'm merging
16:44 dsdeiz joined #git
16:44 ojacobson NaN: can you do the moves and the modifies in separate commits?
16:44 digidog joined #git
16:45 NaN sure I can, but I'm working in a feature branch, so If I move and modify when someone do it in master I will need to fetch that changes
16:45 maestrojed joined #git
16:45 vuoto joined #git
16:46 digidog joined #git
16:47 jbitdrop joined #git
16:48 horse joined #git
16:48 Repox joined #git
16:49 Fuzai joined #git
16:49 eletuchy joined #git
16:49 frem_ joined #git
16:49 ajf- joined #git
16:49 liuzhen joined #git
16:50 MistahKurtz joined #git
16:50 ocbtec joined #git
16:50 Fuzai Hi, I'm learning merging and I've been handing pull requests for a while now, but I'm faced with a pull request that has a stale file that is causing a merge conflict.  How do I either remove the file from the pull request or correctly overwrite it with the upstream version of it?
16:50 introsp3ctive joined #git
16:51 ojacobson !eek
16:51 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
16:51 nnyk_ joined #git
16:52 eletuchy joined #git
16:52 brandonw joined #git
16:52 ash_workz _ikke_: why did you say ohai?
16:57 SirOliver joined #git
16:58 dsdeiz_ joined #git
16:58 qpdb joined #git
16:58 ramsub07 joined #git
16:59 diegoaguilar joined #git
17:00 Reda joined #git
17:00 clemf joined #git
17:01 horse joined #git
17:03 _ikke_ ash_workz: beacuse NaN said hi there
17:03 digidog joined #git
17:03 ash_workz _ikke_: ohai = "oh hi" ?
17:04 _ikke_ yes
17:04 ash_workz heh, k, I thought that might be it
17:05 hahuang62 joined #git
17:05 _ng joined #git
17:05 NaN c:
17:06 mdw_ joined #git
17:07 mdw_ joined #git
17:08 User458764 joined #git
17:09 mingrammer_ joined #git
17:09 introsp3ctive joined #git
17:10 rahtgaz joined #git
17:11 laxen joined #git
17:13 romerocesar joined #git
17:13 fuchstronaut joined #git
17:14 Gitzilla joined #git
17:14 horse joined #git
17:15 gingitsune joined #git
17:15 digidog joined #git
17:17 xpk joined #git
17:17 jstimm_ joined #git
17:18 EvilPenguin joined #git
17:18 kutenai Are there any good flame war discussions regarding --no-ff and --ff? I've been developing for decades, and used a lot of different SCCS's since RCS... I really prefer --ff, yet, the prevailing opinions I find seem to prefer --no-ff. I even follow the gitflow methodology, right up to the point where he suggests --no-ff.. Am I really in the minority here?
17:19 piroko Depends on how much you value keeping logical collections of commits (feature branches) together for later review
17:19 piroko I don't think one is necessarily "better" than the other. Just comes down to your needs and preferences
17:20 GodGinrai ash_workz: I help people in any channel I'm on, if I can be of help.
17:21 piroko We do --no-ff at $job because we use agile and it allows us to tie individual user stories to the group of commits that implemented them
17:21 Macaveli joined #git
17:21 scarcry joined #git
17:21 kutenai If it was just ONE such --no-ff, I could maybe see it.. but I use develop -> release -> master, so using --no-ff on those makes a lot of other "excess" commits IMO
17:21 axiom_1 joined #git
17:22 FuzzySockets joined #git
17:23 eletuchy_ joined #git
17:24 Laxu5 joined #git
17:24 Shapeshifter joined #git
17:25 eletuch__ joined #git
17:25 jbitdrop joined #git
17:27 eletuchy joined #git
17:27 axiom_1 joined #git
17:27 jottr joined #git
17:28 horse joined #git
17:28 MeXTuX joined #git
17:28 ocbtec joined #git
17:29 xaviergmail joined #git
17:30 thiago joined #git
17:30 eletuchy_ joined #git
17:30 T4nk5bb0t joined #git
17:31 jason237 joined #git
17:31 dreiss joined #git
17:32 akushner joined #git
17:32 eijk_ joined #git
17:33 eletuchy joined #git
17:34 romerocesar joined #git
17:35 xpk question regarding rebasing: my workflow is to create a 2nd branch "working" of an existing remote "develop" branch, make changes, then do a pull request to bring my changes in to "develop".
17:35 encod3 joined #git
17:35 xpk where it gets unfamiliar to me is what the process is for when people's changes make it into "develop"
17:35 eletuch__ joined #git
17:35 xpk I would like to make sure my commits are always on top of the latest version of that develop branch, would I do that by rebasing?
17:36 netj joined #git
17:37 jaguarmagenta joined #git
17:38 akushner joined #git
17:38 eletuchy joined #git
17:39 jhass xpk: yes
17:39 jhass git fetch; git rebase origin/develop
17:39 vuoto joined #git
17:39 icio joined #git
17:40 k3rn31 joined #git
17:40 pipegeek joined #git
17:40 mbrzuzy joined #git
17:40 eletuchy_ joined #git
17:40 xpk thanks jhass
17:42 horse joined #git
17:42 elastix joined #git
17:44 eletuchy joined #git
17:45 Sasazuka joined #git
17:46 uhmgswa^2 joined #git
17:46 semantip_ joined #git
17:46 eletuchy_ joined #git
17:47 roknir joined #git
17:48 kadoban joined #git
17:48 eletuch__ joined #git
17:49 uhmgawa^3 joined #git
17:49 icio joined #git
17:50 eletuchy joined #git
17:51 JanC_ joined #git
17:52 clemf joined #git
17:52 pullphinger joined #git
17:53 eletuchy_ joined #git
17:53 pfsmorigo joined #git
17:54 robotroll joined #git
17:54 nwkj86 joined #git
17:55 dsantiago joined #git
17:55 horse joined #git
17:56 mda- joined #git
17:56 maestrojed joined #git
17:57 eletuchy joined #git
17:57 k3rn31 joined #git
17:57 MacWinner joined #git
17:58 akushner joined #git
18:04 livingstn joined #git
18:05 clemf joined #git
18:06 Codfection joined #git
18:09 horse joined #git
18:09 mikecmpbll joined #git
18:10 Joel _ikke_, thanks again for the help, I was able to recover and get back to work quickly
18:10 segment-fault joined #git
18:12 _ikke_ np
18:14 ShekharReddy joined #git
18:14 AaronMT_ joined #git
18:15 joho joined #git
18:16 rgrinberg joined #git
18:16 felipebalbi joined #git
18:16 felipebalbi left #git
18:17 ajf- joined #git
18:18 neps joined #git
18:19 semantipc joined #git
18:19 m0viefreak joined #git
18:19 jost__ joined #git
18:20 xall_ joined #git
18:21 joho joined #git
18:22 mehola joined #git
18:22 horse joined #git
18:25 nettoweb joined #git
18:27 reactormonk left #git
18:28 someguy joined #git
18:29 zarel joined #git
18:29 Levitator joined #git
18:30 synthroid joined #git
18:32 piling_ joined #git
18:35 sagerdearia joined #git
18:36 horse joined #git
18:37 Macaveli joined #git
18:37 EvilPenguin joined #git
18:37 mwhooker joined #git
18:39 someguy I just did a git pull on a repository and now it shows that the repo has untracked files
18:39 someguy git status shows a bunch of deleted files
18:40 someguy how do I make the repo clean?
18:40 _ikke_ Did you run into a conflict?
18:40 someguy no
18:40 User458764 joined #git
18:41 _ikke_ Did ignored files get unignored?
18:41 someguy no
18:42 pfsmorigo Hi, I'm trying to use git bisect to know find what commit break my module. I know that v4.6 is good but v4.7-rc1 is bad. So I start by using: git bisect good v4.6 and git bisect v4.7-rc1. After some goods and bads, git start to use commits before v4.6, like v.4.6.0-rc7. What I'm doing wrong?
18:42 Sasazuka joined #git
18:42 pfsmorigo *to find
18:42 pfsmorigo *git bisect bad v4.7-rc1
18:43 preaction pfsmorigo: perhaps you have an old bisect? did you do git bisect start first?
18:44 nitin joined #git
18:44 pfsmorigo preaction, yes, I did git bisect start first.
18:44 preaction then i dunno, never seen that
18:45 eletuchy joined #git
18:45 pfsmorigo preaction, it's the first time that I use bisect so I almost sure that I'm doing it wrong :)
18:46 xaviergmail joined #git
18:46 pipegeek bisect is the best
18:47 someguy _ikke_: so what should I do?
18:47 pipegeek someguy: not sure what happened.  If, however, you don't have local changes you want to preserve, you can do a hard reset to the upstream branch
18:48 pipegeek so, for instance, if you're on master, you could do, 'git reset --hard origin/master'
18:48 Ahmed90 joined #git
18:48 pipegeek if you have untracked files, you can use 'git status' to find out what they are, and if they aren't important to you you can use 'git clean' to get rid of them.
18:48 _ikke_ someguy: do you have a !transcript ?
18:48 gitinfo someguy: Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
18:49 horse joined #git
18:51 dan2k3k4 joined #git
18:53 stuh84 joined #git
18:54 cdown joined #git
18:54 barteks2x joined #git
18:55 ajf- joined #git
18:56 someguy _ikke_, pipegee: https://vomitb.in/ztzSJcz1Gi
18:56 zeemz joined #git
18:57 CJKinni` joined #git
18:57 bigpic joined #git
18:58 blackwind_123 joined #git
18:59 Reda joined #git
18:59 _ikke_ someguy: And do you expect those files to be tracked?
19:01 bigpic trying to bring in a new remote branch
19:01 bigpic did: git fetch —all
19:01 bigpic but the branches do not show up on the local repo
19:02 jhass how do you assert that?
19:02 bigpic none of examples on stackoverflow are working
19:02 bigpic any ideas?
19:02 jhass show more of what you're doing
19:02 uhmgswa^2 joined #git
19:03 afuentes im trying to get all the files removed on some commit... I tried with git checkout <commit> -- folder..... but it says: error: pathspec 'folder' did not match any file(s) known to git.
19:03 horse joined #git
19:03 afuentes but folder is there on that commit :(
19:03 kadoban afuentes: If they're not in that commit, that's not that surprising. Look in the commit before they were deleted?
19:04 afuentes kadoban, you are right!!!
19:04 afuentes i had to do that commit^
19:04 afuentes :D
19:05 someguy _ikke_: I expect the branch to be clean since I do no local changes on it and simply use it to keep my repo up to date with upstream.
19:05 CJKinni joined #git
19:05 mwhooker joined #git
19:05 kadoban afuentes: I do that all the time, hehe.
19:05 Balliad joined #git
19:07 mikecmpbll joined #git
19:08 fscala joined #git
19:09 JeDa joined #git
19:13 go1111111 joined #git
19:15 fuchstronaut joined #git
19:16 dsdeiz joined #git
19:17 horse joined #git
19:22 ynanm joined #git
19:23 loplin joined #git
19:25 loplin Hello. I did a `git submodule add [..]`, but that submodule also had submodules. How can I tell the repo to pull those as well. I realize I can do a `git clone --recurse-submodules [...]`, but the parent repo has already been cloned
19:25 NaN left #git
19:27 hahuang61 joined #git
19:27 jceb joined #git
19:28 dharriga1 joined #git
19:29 rewt joined #git
19:30 eletuchy joined #git
19:30 horse joined #git
19:31 jabular joined #git
19:31 djh joined #git
19:31 dr_lepper joined #git
19:31 parsnip joined #git
19:31 AustinMatherne joined #git
19:32 nopf joined #git
19:32 kloeri_ joined #git
19:32 perlpilot_tpc joined #git
19:32 babilen joined #git
19:32 Martian joined #git
19:33 sleezd joined #git
19:34 M-meznak joined #git
19:34 AaronMT joined #git
19:35 SenpaiSilver joined #git
19:35 bailon joined #git
19:35 jabular joined #git
19:35 iMiiTH joined #git
19:35 Ricaz joined #git
19:35 Cabanossi joined #git
19:35 EvilDMP joined #git
19:36 Ram-Z joined #git
19:37 d1b joined #git
19:38 setuid joined #git
19:38 Robdgreat joined #git
19:38 chachasmooth joined #git
19:40 Macaveli joined #git
19:42 cdg joined #git
19:42 ilogger2 joined #git
19:42 zeemz joined #git
19:42 Zeedox joined #git
19:42 barteks2x joined #git
19:42 reizuki joined #git
19:42 rnsanchez joined #git
19:43 nivag joined #git
19:43 afuentes joined #git
19:43 tuor joined #git
19:43 tchan joined #git
19:44 quadz joined #git
19:44 xaviergmail joined #git
19:44 zamba joined #git
19:45 malide joined #git
19:47 mwhooker joined #git
19:48 ResidentBiscuit `git submodule update && git submodule update` I think
19:48 preaction git submodule update --init
19:48 GodGinrai ResidentBiscuit: update has a --recursive flag
19:48 ResidentBiscuit TIL
19:48 preaction oh, yeah, i'm wrong too
19:48 ResidentBiscuit I don't deal with submodules often :/
19:48 sbeller git submodule update --recursive
19:49 jimi_ joined #git
19:49 ResidentBiscuit Do you have to init before hand still?
19:49 preaction no, it has an --init flag too
19:49 ResidentBiscuit They really thought of everything
19:49 eka joined #git
19:50 preaction if you want something fixed, annoy a programmer
19:50 italoacasas joined #git
19:50 GodGinrai preaction: does that mean I should keep sounding off about this weird git-hooks problem on windows? :P
19:50 preaction what?
19:50 ResidentBiscuit Ha, I'm more used to "annoy the programmer but then give the programmer no time to fix anything"
19:51 ResidentBiscuit GodGinrai: Still no luck?
19:51 preaction i don't have windows, so i can't really help there
19:51 GodGinrai ResidentBiscuit: nope.  No one ever responded.  I modified my coworker's hook to convert it using `cygpath`, but that shouldn't be necessary
19:52 ResidentBiscuit GodGinrai: I have no idea, but I'd assume soneone around would
19:52 ResidentBiscuit But then again, maybe everybody avoids windows
19:52 GodGinrai lol, I'd avoid it if I could for work
19:52 ojdo joined #git
19:52 GodGinrai but I still find it better than Mac
19:52 ki0 joined #git
19:52 GodGinrai so when the choice is Mac or Windows, I pick Windows
19:53 superteece joined #git
19:53 ResidentBiscuit I know the feel
19:55 GuKKDevel joined #git
19:56 MrWoohoo joined #git
19:57 horse joined #git
19:58 inflames joined #git
20:06 boombatower joined #git
20:07 jmpp joined #git
20:07 jmpp joined #git
20:07 dhollinger joined #git
20:07 icio joined #git
20:07 editshare-ericf joined #git
20:08 fuchstronaut joined #git
20:09 Balliad joined #git
20:10 Raging_Hog joined #git
20:10 LeBlaaanc joined #git
20:11 jeffreylevesque joined #git
20:11 horse joined #git
20:12 invisbl joined #git
20:13 netcarver joined #git
20:14 Codfection joined #git
20:15 Samual joined #git
20:15 Samual joined #git
20:15 eiim joined #git
20:15 cdown joined #git
20:17 eletuchy joined #git
20:17 backnforth joined #git
20:18 ntonjeta joined #git
20:21 ochorocho__ joined #git
20:22 mwhooker joined #git
20:22 elux joined #git
20:23 mwhooker joined #git
20:24 mehola joined #git
20:27 fuchstronaut joined #git
20:30 clemf joined #git
20:33 nnyk_ joined #git
20:33 Electrometro joined #git
20:34 EvilPenguin joined #git
20:34 Electrometro Hey guys, I am trying to store a cron.d file in my git repo. The problem is the file must be owned by the root user and our git repo is owned by another user. Currently I have the file sym linked but I have to change the owner and permissions of the file for cron to accept it making it unreadable by git. Is there a better way to do this?
20:35 clemf joined #git
20:35 ilmari it sounds like you're trying to use git to !deploy
20:35 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
20:35 osse !etckeeper
20:35 gitinfo etckeeper is a collection of tools to let /etc be stored in a git, mercurial, darcs, or bzr repository. It hooks into various package managers. http://etckeeper.branchable.com
20:35 ilmari osse: beat me to it!
20:35 jstimm_ joined #git
20:36 LaptopBrain joined #git
20:37 raijin joined #git
20:37 sybariten joined #git
20:38 timewalker joined #git
20:38 _August_ joined #git
20:38 horse joined #git
20:39 Electrometro osse ilmari So does that keep all of /etc in a different git repo? How can I just include it in my current repo?
20:39 xaa joined #git
20:40 osse I have no clue
20:40 ejnahc joined #git
20:40 ilmari Electrometro: git on its own isn't suitable for what you're trying to do, since it doesn't track permissions and ownership, which are necessary for /etc
20:40 johnny56_ joined #git
20:40 ilmari Electrometro: are you trying to track all of /etc, or just trying to deploy some files from your repo to /etc?
20:40 ojdo joined #git
20:41 Electrometro ilmari: Just one file in /etc/cron.d/
20:41 Electrometro Right now I have it sym linked but that isn't working that great due to having to be owned by root
20:41 ilmari that's a deployment scenario, look at what gitinfo said about that
20:42 skirk joined #git
20:42 _August_ joined #git
20:42 _August_ i pushed a commit to gitlab and the message was wrong so i used a amend and changed the message but on gitlab the message is still the same and has not changed. Am I missing something? Isnt this suppose to change the message?
20:43 Electrometro ilmari: I was thinking about using a githook that on a pull to just copy the file and change the ownership/permissions.
20:43 sdothum joined #git
20:43 GodGinrai _August_: amend changes a commit on local
20:44 ilmari Electrometro: that is one way to do it
20:44 _August_ ahh
20:44 _August_ so how would i change it if ive already pushed it
20:44 _August_ ?
20:44 Electrometro Ok, now are githooks commited in the git repo? (go to everywhere the git repo is)
20:44 ilmari Electrometro: but that doesn't help if you modify it yourself, so you probably want a commit hook too
20:44 osse _August_: use the --force
20:44 GodGinrai osse: <3
20:44 ilmari Electrometro: no, that would be a security vulnerability
20:44 _August_ so git push -f?
20:44 ilmari Electrometro: the scripts can be in the repo, but you have to install them into .git/hooks yourself
20:44 osse _August_: yes, although !rewrite
20:44 gitinfo _August_: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
20:45 Electrometro ilmari: Perfect, i can manage that with puppet. Thanks!
20:45 osse _August_: but if it was ten minutes ago and the other guy has gone home for the day then it's not a problem
20:45 _August_ no one has pulled from it
20:45 _August_ im pretty sure of it
20:45 osse Then beam it up, Scotty!
20:46 osse GodGinrai: how did you like that one
20:46 _August_ there we go
20:46 _August_ thanks
20:46 ePirat joined #git
20:46 ePirat Hello
20:47 GodGinrai osse: if it had included a command or flag, it would have been more interested. :P
20:47 GodGinrai *interesting
20:47 brcolow joined #git
20:47 marvi joined #git
20:47 nettoweb joined #git
20:47 osse ah
20:48 ePirat I have changed .gitignore adding some files and folders to ignore, now I want this to take affect for any past commit in history. I know that this will rewrite history and change all commit shas, that's not a problem as the repo is still private at the moment and I have the only copy.  Is there some way to do this?
20:48 osse GodGinrai: I just assumed that since you liked the star wards reference you would have a star trek reference
20:48 osse but maybe that's not how it works
20:48 osse *hate
20:48 GodGinrai I actually dislike star trek.  However, I would have appreciated one if it was as clever as that star wars reference ;)
20:49 semantip_ joined #git
20:50 osse GodGinrai: fun story: I was at a job interview for a programming position and they gave me a quiz. Amid all the questions about the difference between new and malloc() etc etc. they askid this: "Which is better, Star Wars and Star Trek?"
20:50 osse GodGinrai: And they assured me that it was not a trick question and there was definitely a correct answer
20:51 bittin joined #git
20:51 GodGinrai lol
20:51 GodGinrai that's great XD
20:51 osse GodGinrai: so I answred "Only a trekkie would be so uptight to claim there is a correct answer". I got a job offer.
20:51 GodGinrai nice
20:52 osse I didn't accept the offer, but I did use it to squeeze some extra money out of my current employer. So I have that going for me, which is nice.
20:52 horse joined #git
20:52 GodGinrai well played
20:54 osse oh, you're the guy who's current in a fight in #archlinux. I won't disturb
20:56 Nugget heh
20:57 GodGinrai osse: less a fight, and more trying to explain something to a child, imo
20:58 GodGinrai osse: You'd think I had told him some horrible things about his mother given how he reacted to my comment that he wasn't making sense.
20:59 StuartMI joined #git
21:00 stonerfish joined #git
21:02 sveinse joined #git
21:03 texasmynsted joined #git
21:03 sveinse Is git config --local local machine only, or is the local repo in the sense that it will be synced to others?
21:03 _ikke_ local machine only
21:03 sveinse E.g. setting local repo username and password
21:04 diegoviola joined #git
21:04 texasmynsted If I have branch A and branch B and I cherry pick a commit from B into A, and it just so happens that the only difference is that one cherry-picked commit…  Is the reason that git branch -d B fails because cherry-pick created a new hash for the commit?
21:04 texasmynsted or why?
21:04 qsx the config is never automatically synced
21:04 GodGinrai sveinse: it's local to the repo you are in.
21:04 qsx as it would allow for remote code exec
21:04 jason237 joined #git
21:04 GodGinrai sveinse: --global is your "local machine"
21:05 GodGinrai sveinse: because it applies to git globally on your system
21:05 Electrometro Does anyone know if python git up would trigger the post merge git hook?
21:05 sveinse GodGinrai: yes, obviously
21:06 horse joined #git
21:06 sveinse What is the approach to setup different identities against different remotes? Can this be done globally?
21:06 GodGinrai sveinse: different identities meaning?  like users?
21:06 kadoban sveinse: Using SSH aliases (which can each have different settings and associated keys) is the usual way
21:07 sveinse well, I'm going to push to my github account, which is different from the other things I use. I dont actually know if github offers ssh
21:07 elastix joined #git
21:08 GodGinrai sveinse: it does.  I've never used anything but ssh for interfacing with github
21:09 sveinse OK, my repo is setup with https...
21:09 vuoto joined #git
21:09 caudill joined #git
21:10 kadoban sveinse: You don't have to set a particularly repo on github as available on SSH, it is already. You just have to setup SSH access in your account for yourself.
21:12 texasmynsted so if the only difference between two branches is one commit, and you cherry-pick the commit from branch B to branch A, then they should be the same right?
21:12 hahuang61 joined #git
21:12 texasmynsted Now I should have done a merge but I did a cherry pick.  It seems to me the result should be the same
21:13 aard joined #git
21:14 ki0 joined #git
21:14 kadoban texasmynsted: They won't have the same commit hash if that's what you're asking.
21:15 jstein_ joined #git
21:15 texasmynsted So I should have done a merge and then it would have ff and they would have same hash, then I could delete the old branch B and feel safe?
21:15 GodGinrai texasmynsted: the code might be the same, but the history will be different.  Plus, if you have to resolve conflicts, then if you resolved it differently than it was resolved in the other branch, the code would be different
21:16 Macaveli joined #git
21:18 CJKinni joined #git
21:18 xall_ joined #git
21:19 horse joined #git
21:21 italoacasas joined #git
21:22 backnforth joined #git
21:24 nilg joined #git
21:26 piling joined #git
21:28 StuartMI joined #git
21:29 clemf joined #git
21:32 mwhooker joined #git
21:33 horse joined #git
21:35 ahmed_elgabri joined #git
21:35 texasmynsted no conflict
21:35 Gsham joined #git
21:36 troulouliou_div2 joined #git
21:36 madewokherd joined #git
21:37 cdown_ joined #git
21:38 fuchstronaut joined #git
21:39 jaguarmagenta joined #git
21:39 italoacasas joined #git
21:39 eletuchy joined #git
21:40 ToBeCloud joined #git
21:40 osse GodGinrai: i get it from his perspective though. his mother is high maintenance lolol
21:40 GodGinrai lol
21:42 rahtgaz joined #git
21:43 dsdeiz joined #git
21:43 dsdeiz joined #git
21:46 ahr3n joined #git
21:46 maestrojed joined #git
21:46 liquidjamm joined #git
21:46 horse joined #git
21:47 eletuchy joined #git
21:50 Dougie187 left #git
21:50 allcentury joined #git
21:51 aidalgol joined #git
21:52 mwhooker joined #git
21:53 joki joined #git
21:56 Robdgreat joined #git
21:56 SimonNa joined #git
21:57 fii left #git
22:00 horse joined #git
22:00 neanderslob joined #git
22:02 hahuang61 joined #git
22:04 reim joined #git
22:07 italoacasas joined #git
22:07 Arban joined #git
22:08 xaa joined #git
22:10 artemisart joined #git
22:11 CheckDavid joined #git
22:12 nilg joined #git
22:12 reim joined #git
22:13 horse joined #git
22:14 EvilPenguin joined #git
22:14 uhmgawa joined #git
22:15 clemf joined #git
22:17 Electrometro left #git
22:17 romerocesar joined #git
22:19 Arban joined #git
22:19 shirt joined #git
22:21 ntonjeta joined #git
22:22 clemf joined #git
22:23 jimi_ joined #git
22:23 jimi_ joined #git
22:24 mehola joined #git
22:27 horse joined #git
22:27 romerocesar joined #git
22:29 efdetonator joined #git
22:30 steadystatic joined #git
22:32 Arban joined #git
22:35 ollien joined #git
22:35 annoymouse joined #git
22:37 ollien joined #git
22:37 romerocesar joined #git
22:39 fuchstronaut joined #git
22:41 horse joined #git
22:42 diogenese joined #git
22:42 ntonjeta joined #git
22:43 WaReZ joined #git
22:51 ajf- joined #git
22:52 allcentury joined #git
22:52 LaptopBrain joined #git
22:52 ahmed_elgabri joined #git
22:53 King_Hual joined #git
22:53 King_Hual joined #git
22:53 Arsonide joined #git
22:53 efdetonator joined #git
22:54 horse joined #git
22:55 hashpuppy joined #git
22:58 rkazak joined #git
23:01 aidalgol Why would I only have one file in .git/refs/tags/ when I have many tags (both annotated and lightweight)?
23:01 ramsub07 hello, i've added some commit. How do i check the detailed change in the files that i've changed
23:02 kadoban aidalgol: I think they can also be "packed refs". I don't know exactly how that works, but that term might be enough for you to search for, possibly.
23:03 eletuchy joined #git
23:03 nettoweb joined #git
23:04 b1tchcakes joined #git
23:04 Eugene aidalgol - don't manipulate .git/ directly; use the plumbing commands instead
23:05 Eugene You won't run into the low-level optimizations that way
23:05 FuzzySockets joined #git
23:05 Eugene (when you clone, the refs state is included in the packfile, aka a "packed ref". Until its updated locally, the refs/ entry isn't created)
23:05 xall joined #git
23:05 aidalgol Eugene: I'm not; I'm investigating an error during our build, and trying to understand the stuff under the hood.
23:06 kadoban ramsub07: 'git log --patch' maybe?
23:06 kadoban Or maybe some invocation of git diff, I'm not quite sure what you mean.
23:06 Eugene aidalgol - !xy
23:06 gitinfo aidalgol: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
23:06 sorenb_ joined #git
23:07 Eugene Unless you're doing unit tests for git.git, you shouldn't care about what's in .git/refs/.....
23:07 aidalgol Someone had added a tag with a slash in it, and the next build (on the build server) failed with this error:
23:07 aidalgol error: cannot lock ref 'refs/tags/foo/x.y.z': unable to resolve reference refs/tags/foo/x.y.z: Not a directory
23:07 Eugene There's the real problem
23:07 Arban_ joined #git
23:07 Eugene What's your build server?
23:07 aidalgol So I'm trying to understand why it was trying to create/read that file when the build was not checking out that tag.
23:08 aidalgol Eugene: Jenkins running on Windows.  (I know, I know.)
23:08 Eugene Aha!
23:08 horse joined #git
23:08 ajf- joined #git
23:08 Eugene This sounds like a msysgit bug
23:09 rkazak joined #git
23:09 Eugene Using / in a ref name isn't too common(since it's a reserved character for path separation).
23:09 qsx i object, i see it often enough
23:09 Eugene Are you using Windows?
23:10 qsx occassionally
23:10 Eugene My guess is that msysgit is trying to create a file in a non-existent directory; on POSIX-alike you can do this; NTFS requires the directory to exist first
23:10 Eugene My advice: 1) don't use / for now, 2) make up a test case and report it to the msysgit guys
23:11 kadoban Eugene: POSIX-ish is supposed to allow that? You mean like 'touch somenonexistentdir/whatever' ?
23:12 Eugene Pretty sure? I've forgotten what the syscalls are called
23:12 espindola joined #git
23:12 Eugene `mkdir -p` is what I'm thinking of; I don't know if there's a switch for touch
23:13 kadoban Ah
23:17 FuzzySockets joined #git
23:17 romerocesar joined #git
23:20 ffabi joined #git
23:21 rubyonrailed joined #git
23:21 horse joined #git
23:22 fscala joined #git
23:22 shgysk8zer0 joined #git
23:22 lindenle joined #git
23:22 shgysk8zer0 joined #git
23:23 fahadash joined #git
23:27 jottr joined #git
23:29 fuchstronaut joined #git
23:30 taylorm joined #git
23:31 infernix joined #git
23:35 horse joined #git
23:37 johnmilton joined #git
23:37 mdw joined #git
23:39 jimi_ joined #git
23:40 jaguarmagenta joined #git
23:41 aidalgol Sorry for the late response; I got dragged away by $boss.
23:42 aidalgol It turns out we also had a tag "foo", so since there was already a file "foo", it couldn't create a directory "foo/" under which to put "x.y.z".  This would happen on case-sensitive filesystems, as well, so I don't think this is an msysgit bug.
23:43 inflames joined #git
23:43 aidalgol I agree with you on avoiding slashes in tag names.
23:44 ntonjeta joined #git
23:45 johnny56 joined #git
23:47 Rodya_ joined #git
23:48 romerocesar joined #git
23:48 horse joined #git
23:49 eletuchy_ joined #git
23:50 Reda joined #git
23:51 aax joined #git
23:52 eight58 joined #git
23:52 jceb_ joined #git
23:52 eletuchy joined #git
23:53 ajf- joined #git
23:55 eletuchy_ joined #git
23:57 ajf- joined #git
23:59 ollien Is there something to do something like using listchars when I'm using spaces for indentation? https://ollien.com/screenshots/upwindb539bd.png I know I can do :set listchars=tab:>\ when I have tabs, but I do not know of a way to do the same thing with spaces.
23:59 ollien s/something like/something/
23:59 guardianJ joined #git

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