Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-04

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

All times shown according to UTC.

Time Nick Message
00:02 shmuli joined #git
00:05 Maple joined #git
00:06 BPL If someone wants to give it a shot to this question http://stackoverflow.com/questions/38746110/problems-cloning-projects-with-cygwins-git please be my guest :) , good night
00:07 tesuji joined #git
00:10 JanC_ joined #git
00:10 ctcrnitv joined #git
00:10 jaguarmagenta joined #git
00:10 strbean kadoban: I attempted to follow the recipe at https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
00:11 strbean kadoban: the read-tree command failed with "error: Entry 'website/.eslintrc' overlaps with 'website/.eslintrc'.  Cannot bind."
00:12 justanotheruser joined #git
00:13 strbean I'm guessing that is because everything already exists in the subdirectory of the new repository. I'm lost as to how to handle it.
00:16 nnyk_ joined #git
00:17 ahr3n joined #git
00:18 MattMaker joined #git
00:19 xlegoman joined #git
00:20 jimi_ joined #git
00:21 lvns joined #git
00:21 Topic for #git is now Welcome to #git, the place for git help and 80s hair bands | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Gits N' Roses: Now with more git cherry-pop, git freebase, and starring git Slash!
00:22 rchavik joined #git
00:22 inflames joined #git
00:29 dsdeiz joined #git
00:29 dsdeiz joined #git
00:30 Eugene joined #git
00:30 wgrant joined #git
00:31 bluepixel joined #git
00:31 hahuang61 joined #git
00:31 fission6 joined #git
00:32 sangy joined #git
00:33 dminuoso joined #git
00:33 cqi joined #git
00:34 johnmilton joined #git
00:34 vassagus joined #git
00:38 larsxschneider joined #git
00:38 byteflame joined #git
00:40 mehola joined #git
00:41 dmto joined #git
00:42 Eugene joined #git
00:44 nights joined #git
00:44 MattMaker joined #git
00:47 offby1 left #git
00:47 danslo joined #git
00:48 boombatower joined #git
00:48 foist joined #git
00:49 crayon joined #git
00:51 wxg joined #git
00:54 sarbs joined #git
00:57 Vampire0 joined #git
00:59 interne7y joined #git
01:00 CEnnis91 joined #git
01:00 livingstn joined #git
01:00 cyphase joined #git
01:01 rchavik joined #git
01:02 ISmithers joined #git
01:03 shmuli joined #git
01:03 interne7y joined #git
01:04 z3t0 joined #git
01:04 titanium17 joined #git
01:05 z3t0 hi all im looking for suggestions for a clean, simple git gui for mac that i mainly want to use to review history and diff, i wont be using it for things like committing or merging etc.
01:05 titanium17 joined #git
01:05 zacts joined #git
01:06 z3t0 im thinking of using the github desktop for mac
01:06 Anthea joined #git
01:09 mathstuf joined #git
01:10 MZAWeb joined #git
01:11 sarbs joined #git
01:11 Gianormagantrous joined #git
01:13 mathstuf hi, i have tests which manipulate git refs and is like to not have them conflict; i though GIT_NAMESPACE would help, but that only applies on push/fetch operations
01:13 mathstuf is there some other mechanism i can use?
01:13 afusion joined #git
01:14 texinwien_ joined #git
01:16 ToBeCloud joined #git
01:16 b1tchcakes joined #git
01:19 cyphase joined #git
01:22 Atlantic777 joined #git
01:22 Atlantic777 joined #git
01:23 rgrinberg joined #git
01:24 harish_ joined #git
01:24 MattMaker joined #git
01:28 Vampire0_ joined #git
01:30 bremner mathstuf: you could make a local clone to do the test in. It's very fast on the same filesystem
01:32 mathstuf i suppose that's probably the best solution now; itd be nice if GIT_NAMESPACE (or similar) could be used to "chroot" operations on refs similar to how worktrees do so for checkouts
01:33 robotroll joined #git
01:33 larsxschneider joined #git
01:33 dminuoso joined #git
01:36 pks joined #git
01:37 mathstuf hmm...maybe i could abuse GIT_COMMON_DIR?
01:38 mathstuf oh, bare clones would avoid the fs for a checkout as well
01:38 mathstuf duh
01:38 ShekharReddy joined #git
01:39 vassagus joined #git
01:39 Jeroen joined #git
01:39 titanium17 joined #git
01:40 dreiss joined #git
01:41 Dougie187 joined #git
01:46 mellernoia joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and 80s hair bands | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Gits N' Roses: Now with more git cherry-pop, git freebase, and starring git Slash!
01:52 Charliechin joined #git
01:52 mellernoia joined #git
01:53 fuchstronaut joined #git
01:54 Jeroen joined #git
01:55 d^sh joined #git
01:55 Sucks joined #git
01:56 ytl joined #git
01:56 dreiss joined #git
01:57 mellernoia joined #git
01:59 rchavik joined #git
01:59 david007 joined #git
01:59 shmuli joined #git
02:00 mellernoia-work joined #git
02:00 Jeroen joined #git
02:03 MZAWeb_ joined #git
02:05 Goplat joined #git
02:06 mathstuf joined #git
02:08 sagerdearia joined #git
02:09 mellernoia joined #git
02:09 jaguarmagenta joined #git
02:12 sdothum joined #git
02:14 shmuli joined #git
02:14 dmto joined #git
02:19 sdothum joined #git
02:22 thiago joined #git
02:23 larsxschneider joined #git
02:23 Jeroen joined #git
02:24 Literphor joined #git
02:29 sdothum joined #git
02:29 dreiss joined #git
02:30 mrkurtz joined #git
02:33 k_sze[work] joined #git
02:33 k_sze[work] I still haven't really figured out how to make `git diff` highlight changes in whitespace.
02:34 hahuang61 joined #git
02:34 xpk joined #git
02:34 bremner k_sze[work]: did you look at the option ws-error-highlight ?
02:35 k_sze[work] That's not available until git 2.5, right?
02:36 dminuoso joined #git
02:36 k_sze[work] I'm still on git 2.1.4, because Debian.
02:37 bremner use backports.debian.org
02:37 bremner if you can...
02:38 k_sze[work] Maybe I should do a local compile.
02:38 k_sze[work] I don't want to risk changing the git version for other uses.
02:38 k_sze[work] s/uses/users/
02:38 Jeroen joined #git
02:39 bremner your call. Backports is mostly fairly safe, but it is a new version.
02:41 mehola joined #git
02:41 Literphor joined #git
02:45 vassagus joined #git
02:45 Literphor joined #git
02:45 danimal2 joined #git
02:47 mjuszczak joined #git
02:48 danslo joined #git
02:49 chachasmooth joined #git
02:49 durham_ joined #git
02:50 hexagoxel joined #git
02:50 skylite joined #git
02:51 spudowiar joined #git
02:51 Sucks joined #git
02:51 lagothri1 joined #git
02:51 shmuli joined #git
02:51 spudowiar joined #git
02:53 sdothum joined #git
02:54 Dougie187 left #git
02:54 Charliechin joined #git
02:57 shmuli joined #git
02:58 Skrives joined #git
02:59 dreiss joined #git
03:01 ytl_ joined #git
03:03 shmuli joined #git
03:06 mohabaks joined #git
03:06 sargas joined #git
03:16 surfnturf_ joined #git
03:16 surfnturf_ what is the proper oauth token for read-only private?
03:19 ariver joined #git
03:25 jaguarmagenta joined #git
03:25 dmto joined #git
03:26 aavrug joined #git
03:27 aavrug joined #git
03:27 sdothum joined #git
03:27 k_sze[work] bremner: I got git 2.9.2 built and installed locally.
03:28 k_sze[work] and --ws-error-highlight does work.
03:28 bremner does it help?
03:28 k_sze[work] How do I make it the default? Is there a corresponding config option?
03:28 bremner you might have to make an alias
03:29 dreiss joined #git
03:30 fstd_ joined #git
03:31 netj joined #git
03:33 MrWoohoo joined #git
03:35 kg6hum left #git
03:35 dmto joined #git
03:36 ash_workz joined #git
03:36 dminuoso joined #git
03:36 Finnoloid joined #git
03:39 kini joined #git
03:40 HappyLoa- joined #git
03:42 surfnturf_ left #git
03:45 sdothum joined #git
03:47 knod joined #git
03:48 knod left #git
03:48 mehola joined #git
03:50 zivester joined #git
03:51 indistylo joined #git
03:54 fuchstronaut joined #git
03:55 dmto joined #git
03:59 vassagus joined #git
04:00 arescorpio joined #git
04:02 sdothum joined #git
04:02 orbisvicis joined #git
04:03 orbisvicis if I've rebased and amended old commits, how do I remove references to the older commits from .git ?
04:03 dmto joined #git
04:03 POCKETS joined #git
04:03 thecomedian joined #git
04:03 preaction orbisvicis: you can use git gc to force a cleanup
04:04 atrus orbisvicis: why do you want to do that? what's the problem you're trying to solve?
04:05 orbisvicis put some personal info in the commit message
04:05 phanimahesh joined #git
04:05 orbisvicis git gc --prune=now --aggressive, doesn't remove the references
04:09 sdothum joined #git
04:09 dminuoso joined #git
04:10 sarbs joined #git
04:10 sdothum joined #git
04:11 POCKETS running -- git version 2.9.2.windows.1 -- GNU bash, version 4.3.46(2)-release. with most recent build of sublime text 3. trying to figure out how to make Sublime the default text editor. lots of conflicting info so far. Any one familiar
04:12 MZAWeb joined #git
04:12 rscata joined #git
04:13 POCKETS anybody?
04:14 POCKETS left #git
04:14 orbisvicis export EDITOR=... ?
04:15 atrus orbisvicis: not sure, but googling for 'how do delete sensitivie git commit' returns a bunch of results, including http://blog.stevenocchipinti.com/2014/03/10/completely-removing-a-git-commit-due-to-sensitive-information/
04:15 orbisvicis atrus: hrm, I just recloned the repository, copied the changes, and created a new commit :(
04:18 rchavik joined #git
04:20 tjone270__ joined #git
04:21 arescorpio joined #git
04:22 HanClinto joined #git
04:23 Limes__ joined #git
04:23 waveclaw joined #git
04:24 cyan__ joined #git
04:24 Lvjasha joined #git
04:28 ytl joined #git
04:34 hahuang61 joined #git
04:34 shmuli joined #git
04:37 Charliechin joined #git
04:37 jaguarmagenta joined #git
04:38 Cabanossi joined #git
04:40 ShekharReddy joined #git
04:46 dminuoso joined #git
04:49 danslo joined #git
04:53 freimatz joined #git
04:53 gtristan joined #git
04:57 Raging_Hog joined #git
05:00 subhojit777 joined #git
05:01 fairuz joined #git
05:04 govg joined #git
05:05 vassagus joined #git
05:09 SwiftMatt joined #git
05:10 sdothum joined #git
05:12 sdothum joined #git
05:12 nilg joined #git
05:14 sdothum joined #git
05:15 dminuoso left #git
05:23 ambro718 joined #git
05:24 bocaneri joined #git
05:27 alfy joined #git
05:34 sostenuto joined #git
05:35 alfy joined #git
05:37 zeroed joined #git
05:38 satya4ever joined #git
05:39 abhinav joined #git
05:39 abhinav hi
05:40 abhinav while merging branchone to branchtwo, i got conflict. hence i solved those conflicts, save the files. then when i do git add -p file it says nothing changes ignoring. after that while doing git commit it lists those two files as unmerged. how to fix this?
05:40 i7c Ohai!
05:42 kadoban abhinav: I can't imagine there's much reason to do add -p (specifically the -p) in a conflict resolution? Try without? Not that I'm sure why it'd matter.
05:43 abhinav kadoban: that works. but why should it fail on -p??
05:43 govg joined #git
05:44 kadoban Not sure. Maybe kind of by design since the semantics of that are a little weird, should it count a conflict as resolved or not when you 'add -p'?
05:45 zeemz joined #git
05:47 abhinav ok.
05:47 GavinMagnus joined #git
05:48 rchavik joined #git
05:53 dsdeiz_ joined #git
05:54 fuchstronaut joined #git
05:58 xall joined #git
05:58 xall joined #git
06:00 xlegoman joined #git
06:00 HappyLoa- joined #git
06:01 alfy joined #git
06:08 tgunr joined #git
06:08 Phreya joined #git
06:09 alfy joined #git
06:09 vassagus joined #git
06:10 ericsupreme joined #git
06:12 m1dnight_ joined #git
06:12 ahmedelgabri joined #git
06:13 lordjancso joined #git
06:13 star_prone joined #git
06:13 Sleepy63 joined #git
06:17 GavinMagnus left #git
06:17 korolev joined #git
06:17 Vampire0 joined #git
06:18 alfy joined #git
06:19 rchavik joined #git
06:20 texinwien_ joined #git
06:21 star_prone joined #git
06:22 Sleepy63 joined #git
06:22 rscata joined #git
06:23 larsxschneider joined #git
06:23 freimatz joined #git
06:25 reda joined #git
06:25 Macaveli joined #git
06:26 dreamyspell joined #git
06:29 shmuli joined #git
06:30 korolev joined #git
06:32 fairuz joined #git
06:34 jstimm joined #git
06:34 inflames joined #git
06:35 hahuang61 joined #git
06:35 JeroenT joined #git
06:35 zeemz joined #git
06:36 JeroenT joined #git
06:38 Softeisbieger joined #git
06:39 gtristan joined #git
06:40 Aces_Charles joined #git
06:41 JeroenT joined #git
06:41 zincrokx joined #git
06:43 zincrokx joined #git
06:43 mithenks joined #git
06:43 zincrokx joined #git
06:44 zincrokx joined #git
06:45 zincrokx joined #git
06:46 zincrokx joined #git
06:47 zincrokx joined #git
06:47 danslo joined #git
06:47 nikitasius joined #git
06:49 korolev joined #git
06:49 Sceorem joined #git
06:54 ShapeShifter499 joined #git
06:55 submitnine joined #git
06:59 maroloccio joined #git
06:59 jknetl joined #git
07:01 zarubin joined #git
07:04 PCatinean joined #git
07:04 zeroed joined #git
07:06 star_prone joined #git
07:07 larsxschneider joined #git
07:09 m1dnight1 joined #git
07:10 Shentino joined #git
07:10 dreiss joined #git
07:12 bakibour joined #git
07:13 bakibour left #git
07:14 bourbaki joined #git
07:14 bourbaki Hiho, is there any way to pass a standard action to git clean so if i run it on some server the console wont block because it is expecting some input?
07:14 TomyWork joined #git
07:14 Lomex joined #git
07:15 moritz bourbaki: yes!
07:15 i7c bourbaki, git clean is per default non-interactive. At least I thought so.
07:15 mariuscc joined #git
07:15 moritz $ git clean
07:15 moritz fatal: clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean
07:15 vassagus joined #git
07:15 underpantz joined #git
07:15 moritz it even tells you the config you need to touch
07:15 bourbaki Hm
07:16 moritz only git clean -i is interactive
07:16 i7c Either set that option or just run clean -f on the server, uh-huh.
07:16 shmuli joined #git
07:16 bourbaki Well but when i call git clean and some file is locked eg because i use that file with visual studio or vscode then it will tell me that it can not be unlinked
07:16 bourbaki and asks me to press y or n to retry
07:17 danslo joined #git
07:17 bourbaki and i run it with dxf
07:18 DevAntoine joined #git
07:19 i7c Sounds like you should blame Windows for being utterly stupid.
07:19 garethdaine joined #git
07:19 bourbaki ?
07:19 talin hello. i'm in some weird state with git... whatever i do, it says "not a stuff.git repo" at the bottom
07:20 talin so i checkout master and then it says i am behind by 1 commit.. so i fetch and rebase and it says "not a stuff.git repo" and "could not detach from HEAD"
07:20 jas4711 joined #git
07:21 talin status tells me "HEAD detatched from refs/heads/master. nothing to commit, working dir clean"
07:22 tobiasvl talin: !detached_head
07:22 gitinfo talin: [!detached] A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
07:23 talin !reattach
07:23 gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
07:23 Balliad joined #git
07:23 talin yep, so i keep doing "git checkout other branch" but i am still detached
07:24 moritz talin: what's "other branch"?
07:25 moritz 'cause it doesn't work with remote branches
07:31 dreamyspell_ joined #git
07:35 aidalgol joined #git
07:35 lemunayd joined #git
07:36 tvw joined #git
07:36 aidalgol joined #git
07:37 maroloccio joined #git
07:37 haribo joined #git
07:37 nwmcsween_ joined #git
07:38 nwmcsween_ left #git
07:39 nwmcsween joined #git
07:39 nwmcsween is there a way to map files from repo a to repo b?
07:39 talin moritz: well i have a branch called 3.0
07:40 talin moritz: so i check out 3.0 and then git checkout master
07:40 nwmcsween as in preserving history
07:40 talin i tried git reset --hard origin/master but then if i checkout any other branch and then master again, it says that it is not a myrepo.git repo
07:41 nwmcsween e.g cat map.txt -> dir/foo/file.c /dir/bar/file.c
07:41 nwmcsween git magic map.txt
07:42 cdown joined #git
07:45 JeroenT joined #git
07:48 MafiaInc joined #git
07:52 DJ_Spies joined #git
07:54 GavinMagnus joined #git
07:56 j416 nwmcsween: "map"?
07:57 j416 nwmcsween: you can merge a branch of one repo into a branch of the other, if that is what you mean
07:57 nwmcsween no
07:58 nwmcsween I want file dir/foo/file.c in repo x to be mapped to dir/bar/file.c in repo y
07:58 tobiasvl mapped?
07:58 j416 what do you mean by "mapped"?
07:58 tobiasvl symlinked?
07:58 maroloccio joined #git
08:00 ki0 joined #git
08:00 hahuang65 joined #git
08:01 alcohol nwmcsween: no such thing for files. directories only afaik.https://help.github.com/articles/about-git-subtree-merges/
08:03 bongjovi joined #git
08:04 p4trix joined #git
08:04 nwmcsween I'm guessing I would have to do some fancy work with git filter-branch to get it to work
08:05 j416 nwmcsween: it's hard to help out when we don't know what you want to achieve.
08:10 artgoeshere joined #git
08:11 star_prone joined #git
08:13 tomog999_ joined #git
08:14 dmto joined #git
08:18 shmuli joined #git
08:18 jceb joined #git
08:19 marcogmonteiro joined #git
08:19 vassagus joined #git
08:22 satya4ever_ joined #git
08:23 satya4ever_ left #git
08:24 chll_ joined #git
08:25 shmuli joined #git
08:28 hahuang61 joined #git
08:30 marcogmonteiro joined #git
08:31 Sazhen86_ joined #git
08:34 Thorn joined #git
08:38 texinwien_ joined #git
08:39 interne7y joined #git
08:40 bourbaki left #git
08:43 ShekharReddy joined #git
08:43 hwoarang joined #git
08:45 quackgyver joined #git
08:46 monty joined #git
08:46 fuchstronaut joined #git
08:46 heroux joined #git
08:49 xaa joined #git
08:51 GavinMagnus left #git
08:52 piling joined #git
08:54 zarubin joined #git
08:56 robi251 joined #git
08:57 notebox joined #git
09:00 Vampire0 joined #git
09:02 Anticom joined #git
09:03 jstein_ joined #git
09:03 mischat joined #git
09:09 danslo joined #git
09:10 mohabaks joined #git
09:14 tlolczyk joined #git
09:15 tlolczyk Is there a wayu to store your git 4repositorty in a place different from your source?
09:15 rahtgaz joined #git
09:15 alcohol tlolczyk: ?
09:16 alcohol tlolczyk: you mean, the .git directory?
09:16 bremner tlolczyk: man git, see --git-dir
09:16 gitinfo tlolczyk: the git manpage is available at http://jk.gs/git.html
09:16 bremner or --work-tree
09:16 tlolczyk alcohol, pretty much.
09:16 alcohol see suggestion(s) from bremner
09:16 bremner and the corresponding env variables
09:16 jceb joined #git
09:18 fairuz joined #git
09:18 tlolczyk bremmer, Does it work with bare repoitories?
09:18 shmuli joined #git
09:20 cyphase joined #git
09:21 armyriad joined #git
09:21 alcohol why would that work with a bare repository?
09:21 alcohol i think you do not understand what bare implies :p
09:22 zarubin joined #git
09:25 vassagus joined #git
09:25 garethdaine joined #git
09:26 MattE joined #git
09:27 nilg joined #git
09:29 hahuang61 joined #git
09:34 eVolutive joined #git
09:40 interne7y joined #git
09:40 govg joined #git
09:40 larsxschneider joined #git
09:45 DolphinDream joined #git
09:45 jceb joined #git
09:45 fabio_ joined #git
09:45 ferr joined #git
09:47 GavinMagnus joined #git
09:47 bremner tlolczyk: maybe you should back up and tell us about your high level problem, there may exist canned solutions
09:50 liuzhen joined #git
09:50 hwoarang joined #git
09:53 phanimahesh !xy
09:53 gitinfo 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...
09:55 bremner well, yes.
09:56 garethdaine joined #git
10:01 ams__ joined #git
10:01 freimatz joined #git
10:03 yuhlw_ joined #git
10:03 vuoto joined #git
10:04 igor987 joined #git
10:06 wwwi joined #git
10:06 _Patrick_ joined #git
10:06 spudowiar joined #git
10:09 fuchstronaut joined #git
10:10 vuoto joined #git
10:11 hwoarang joined #git
10:12 vuoto joined #git
10:13 meditans_ joined #git
10:14 vuoto joined #git
10:15 fuchstronaut joined #git
10:16 gtristan joined #git
10:17 vuoto joined #git
10:18 fuchstronaut joined #git
10:20 shmuli joined #git
10:22 zarubin joined #git
10:24 igor987 left #git
10:26 Goba_ joined #git
10:26 Goba_ left #git
10:26 hooo joined #git
10:28 hooo hi guys i have trouble with git. Git's entire purpose is to archive code.. so I can get back to it. But that's exactly where my problem is, I keep losing code. How do I find code in git again? I often have trouble remembering exactly when I did something, I just know in file X i had a few lines of code somewhere that did the job and that was around 2 weeks ago. How do I find that in git again?
10:28 fuchstronaut joined #git
10:29 hooo maybe I'm using git the wrong way, I basically use it as a backup for code instead of backing up specific features that are done i just push all my code at the end of the day
10:29 sonOfRa well, just put a summary of what you did at the end of the day in your commit message
10:29 vassagus joined #git
10:29 sonOfRa Or commit individual pieces of work
10:30 kadoban hooo: Yeah, backups are different ... your commits should be small intelligable snippets of changes.
10:30 hahuang61 joined #git
10:31 kadoban Commiting at the end of the day is ... terrible. When I'm actively working, I commit something like once every 5 minutes on average.
10:31 Zarthus depends on the complexity of the system
10:31 Zarthus and the size of the feature
10:32 hooo well but in general, is there an easy gui or at least some kind of command to find my code like i said in my example?
10:32 hooo right now it feels like git is a black hole of sorts, i push code in and it's pretty much gone
10:32 kadoban hooo: 'git log' has many many ways to show history, one of them is probably what you want.
10:33 Gonzo89 joined #git
10:33 hooo i have a repo where I *know* i had to have pushed a specific thing but i cant find it again
10:33 kadoban -G option could be helpful, also just browsing through --patch output, possibly in a specific range or starting from a specific time at least.
10:33 kadoban You can also limit it to changes to certain files
10:35 kadoban hooo: Having good commit messages also helps, and having small commits is going to help too. You can search for commits that have certain things in their commit message, etc.
10:37 JeroenT joined #git
10:38 hooo kadoban, ok i understand so it sounds like git isn't really meant to be full text searchable in the sense I would need
10:38 hooo i would need something like "show me all the previous versions of this file" i guess
10:39 mohabaks joined #git
10:39 joko joined #git
10:39 kadoban Well, it is searchable, sure. Yeah, that's pretty much 'git log --patch -- the_file', except that shows changes instead of previous versions.
10:39 hooo i cant decipher changes really well, i just want to see the entire file
10:39 kadoban git blame might be what you want for previous versions
10:41 kadoban I'm sure there's a one-liner bash script to show you previous versions directly of a file, too lazy to come up with it right now though.
10:41 joko Hello, could anyone remind me how to sync branches between remote repositories? I have forked a repo in GitHub and now I wish to sync my personal GH repo (so add + remove branches) and keep my personal branches (that can also be found in local repo)
10:42 circ-user-PrnTw joined #git
10:42 hooo ok i can do that myself, i am just confused because to me it seemed almost like the primary purpose of git is hardly supported
10:43 kadoban "show me every previous version of this file in order" isn't really a primary purpose of git, I don't know of any workflow that uses that.
10:43 hooo how else would I find previous code in order to know what i need to revert? git is for storing code so you dont lose it, no?
10:44 kadoban You usually look for previous *changes* if you're looking for where something happened, which is what a lot of stuff is geared towards really.
10:45 hooo git is very hard to use for me for multiple reasons. for example i often completely revamp the project, delete half the files, rename them etc. Then when I try to push that, there is always some kind of a problem
10:45 hooo or move them around
10:45 kadoban Git doesn't really care if you do that ... there shouldn't be any particular problems with that.
10:47 Noldorin joined #git
10:47 fuchstronaut joined #git
10:48 kadoban I'm not really sure what you'd commonly run into there, possibly just not staging your changes? People tend to move files and then not actually tell git that. You just have to stage the change though ... afterwards or using 'git mv' directly.
10:48 vuoto joined #git
10:48 ahmedelgabri joined #git
10:49 yoan joined #git
10:53 anuxivm joined #git
10:54 cdown_ joined #git
10:55 shwet joined #git
10:55 weox joined #git
10:57 shwet left #git
11:01 danslo joined #git
11:02 GavinMagnus joined #git
11:06 jguillen joined #git
11:06 jguillen left #git
11:15 sdothum joined #git
11:15 mooncup joined #git
11:15 mooncup afternoon guys
11:15 mooncup has anyone experienced an issue where the files they are trying to commit just vanish?
11:16 mooncup this is using windows to access a samba share that contains the repo
11:16 mooncup mounted as a network drive
11:16 mooncup a linux server also has access to that share
11:16 mooncup the issue is impossible to reproduce
11:16 mooncup it just occasionally happens
11:16 cdown joined #git
11:17 ojdo joined #git
11:20 Mo joined #git
11:21 Mo Hi, rev-list gives me the reverse list, I need the not reversed list. Is that git rev-list --reverse? Isn't it insane to use reverse --reverse? Or is it sane?
11:21 ReturnOfGeekNerd joined #git
11:22 zarubin joined #git
11:28 ReturnOfGeekNerd left #git
11:28 osse Mo: nothing wrong with --reverse
11:29 omegak joined #git
11:29 osse what do you need it for?
11:29 shum joined #git
11:29 aguimaraes1986 joined #git
11:30 tjone270 joined #git
11:31 hahuang61 joined #git
11:31 somaReverse joined #git
11:31 grawity Mo: it's not "reverse --reverse", it's "revision-list --reverse"...
11:31 oqui joined #git
11:32 Zarthus Does anyone know why '!ops' responds with '!fixup' for gitinfo?
11:33 grawity !factoids
11:33 gitinfo [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
11:33 grawity probably closest-match to !oops
11:33 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
11:33 Zarthus ah
11:33 grawity !factoads
11:33 grawity !factods
11:33 grawity !factoid
11:33 gitinfo [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
11:34 grawity !actoids
11:34 grawity hmm
11:34 kadoban grawity: Well ... "git-rev-list - Lists commit objects in reverse chronological order", that certainly sounds like it's short for reverse-list
11:34 grawity kadoban: it's still not
11:34 grawity I mean, it doesn't go out of the way to provide the reverse chronological order
11:34 grawity that's just how the DAG is linked togethre
11:34 sdothum joined #git
11:35 grawity so an explicit --reverse makes sense here
11:35 vassagus joined #git
11:38 armyriad joined #git
11:39 armyriad joined #git
11:39 Zarthus grawity: I went ahead and submitted it as a gitinfo bug on github,  jast can decide if it's worth fixing
11:40 cin_ joined #git
11:40 cin_ left #git
11:40 cinatic joined #git
11:40 cinatic hi
11:41 interne7y joined #git
11:41 cinatic is it possible to move a complete git server to another like creating a tar of all the files and move it to the new server?
11:41 johnmilton joined #git
11:41 JeroenT joined #git
11:42 kadoban cinatic: What kind of git server?
11:42 garethdaine joined #git
11:42 cinatic i have a linux box with git on it where i create the repositories with bare init
11:43 grawity just rsync it over, or copy a tarball of everything
11:43 grawity it's not like the repositories root themselves into the disk platters
11:43 kadoban cinatic: If they're just plain git repositories, yeah those are just files, copy them as you like.
11:44 fission6 joined #git
11:44 indistylo joined #git
11:44 cinatic nice, after that i think i need to change the remote of all the clones (new domain)?
11:45 GavinMagnus joined #git
11:45 grawity yes
11:46 cinatic thx
11:46 kadoban Yeah, you'll likely have to do that. I like to use a special SSH alias for my remotes usually, so changing it for all of them is as simple as just changing one line in the SSH config. But can't really do that after the fact. I mean I guess git config has the ability to rewrite URLs arbitrarily for you, but I forget how that works.
11:48 cinatic ok
11:48 jeffreylevesque joined #git
11:50 cd-rum joined #git
11:52 fahadash joined #git
11:52 MrMojito joined #git
11:53 vuoto joined #git
11:54 vuoto joined #git
11:55 vuoto joined #git
11:55 cd-rum joined #git
11:57 synthroid joined #git
11:59 afusion joined #git
12:02 berndj joined #git
12:02 johnmilton joined #git
12:02 bobdobbs joined #git
12:05 Sceorem joined #git
12:06 rafalcpp joined #git
12:07 armyriad joined #git
12:11 bruce_lee joined #git
12:11 bruce_lee joined #git
12:13 dmto joined #git
12:14 sonOfRa joined #git
12:17 dsdeiz joined #git
12:18 dmto joined #git
12:20 ncd|leeN joined #git
12:21 Wind0r joined #git
12:22 zarubin joined #git
12:22 somaReverse joined #git
12:24 cqi joined #git
12:26 settermjd joined #git
12:27 JeroenT joined #git
12:27 dsdeiz joined #git
12:30 fairuz joined #git
12:30 ahmedelgabri joined #git
12:31 ShapeShifter499 joined #git
12:31 jast Zarthus: you can already add "ignore" triggers so it's not really a bug in the code :)
12:31 hahuang61 joined #git
12:31 airdisa joined #git
12:32 jast though I just noticed it's not documented
12:32 Zarthus yeah, it's not really a bug but it's still something that probably deserved attention :)
12:33 livingstn joined #git
12:33 jast oh yeah, I remember now
12:35 fuchstronaut joined #git
12:35 jast .trigger_edit ops @/dev/null (there's currently no information about ops in the bot but it automatically matches !oops which is an alias for !fixup. This placeholder avoids confusion.)
12:35 gitinfo jast: Okay.
12:35 jast !ops
12:35 sdothum joined #git
12:35 jast Problem Solved (tm)
12:36 Quaeram joined #git
12:39 t0by joined #git
12:39 vassagus joined #git
12:39 sdaugherty jast, which infobot is that, I might want to use it elsewhere :)
12:40 sanketdg joined #git
12:40 jast !source
12:40 gitinfo [!official] Some official resources for git. Homepage: http://git-scm.com/ | Source repo: https://www.kernel.org/pub/scm/git/git.git/ (Mirrrored: https://github.com/git/git/) | IRC channel: You're in it. | Mailing list: http://vger.kernel.org/vger-lists.html#git (git@vger.kernel.org, subscription optional)
12:40 jast nah, that's not it
12:40 jast !bot
12:40 gitinfo [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans.  Please see http://jk.gs/git/bot for more information about how to (ab)use me.
12:40 jast there's a link there somewhere
12:40 jost joined #git
12:41 i7c joined #git
12:41 sdaugherty jast, thanks, that led me to https://github.com/jast/gitinfo which seems to be what I'm interested in :)
12:41 gitinfo sdaugherty: you're welcome, but please note that I'm a bot. I'm not programmed to care.
12:41 jast yeah, that's the one
12:42 Maple joined #git
12:42 jast also, proof just now that the bot's very simple natural language parser is far from infallible :}
12:42 sdaugherty hahaha, not programmed to care, I feel like that sometimes :P
12:42 jast do you have the excuse of being an IRC bot, though?
12:42 jast because gitinfo does
12:43 qsx jast: for all we know, we might just as well be some researcher’s guinea pigs :)
12:43 * gitinfo is the researcher
12:43 sdaugherty I've been accused of being one before, but no, last I checked I'm made of flesh and blood instead of bits and bytes.
12:44 gitinfo qsx: I have to say, you're one of my more interesting cases...
12:44 qsx tsk :D
12:45 GavinMagnus left #git
12:45 gitinfo I'm not going to expand on that here, I'm sure you don't want the whole world to know about that thing you do with the tuna and the particle accelerator
12:45 danslo joined #git
12:45 gitinfo TMI and all that
12:46 bremner more like too much entropy
12:46 GavinMagnus joined #git
12:46 jast entropy is boring
12:46 segment-fault joined #git
12:47 pks joined #git
12:48 snowkidind joined #git
12:48 rgrinberg joined #git
12:48 fairuz_ joined #git
12:49 pks joined #git
12:49 ayushdeva joined #git
12:49 daniel_rose joined #git
12:49 fission6 joined #git
12:50 qsx sorry i don’t do anything with tuna.
12:50 veilig2000 joined #git
12:52 HoierM joined #git
12:53 MadLamb joined #git
12:53 pks joined #git
12:53 anuxivm joined #git
12:54 xlegoman joined #git
12:55 GavinMagnus left #git
12:57 Alejandro-25 joined #git
12:57 garethdaine joined #git
12:58 ChristopheT joined #git
12:58 ChristopheT left #git
13:01 ayushdeva joined #git
13:02 jimi_ joined #git
13:03 sanketdg joined #git
13:04 bongjovi Hi, I have a repository that I'm pushing changes to, usually I just push to the master branch but I have a round of changes that I want to propose before they are merged with the master branch. What's the standard approach to pushing proposed changes to a repository, create a dev branch?
13:04 grawity yes
13:04 bongjovi sorry if this is a very basic question, not so experience with git
13:04 bongjovi experienced*
13:04 bongjovi okay, is there a standard naming convention for this branch? dev? or does it not matter?
13:05 grawity better name it after the actual feature, usually
13:05 bongjovi makes sense, thanks
13:05 anuxivm joined #git
13:06 stfn joined #git
13:06 grawity putting all such branches in a "subdirectory", like dev/ or wip/ or bj/sprinkle-pixie-dust, is common in some places
13:08 CEnnis91 joined #git
13:09 fmcgeough joined #git
13:10 bongjovi ah i see, that makes sense
13:11 anuxivm joined #git
13:11 andrey_utkin joined #git
13:12 bongjovi so if I have my local master branch, and a remote master branch, is it advisable to create a "proposed" branch locally and remotely or can I just create the remote branch?
13:13 andrey_utkin i store git workcopies on syncthing-shared directories on my workstations. Sometimes I notice that git commands like "git diff" take long time when i switch from one machine to another, and I guess that git caches objects' inode numbers or such. Is it true that there is such optimizations which are conflicting with such usecase? Can i turn that off or tune somehow?
13:13 grawity bongjovi: if you're going to work on it more later, better have it in a separate branch locally as well
13:14 tvw joined #git
13:14 grawity andrey_utkin: well, if you turn them off, then it's going to be slow every time
13:14 MattMaker joined #git
13:14 andrey_utkin grawity, do you know how to turn that off?
13:14 andrey_utkin or what to look for?
13:14 fuchstronaut joined #git
13:15 grawity nope, search `man git config` for index-related options
13:15 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
13:15 andrey_utkin maybe i could configure it to store caches outside of GIT_DIR
13:16 andrey_utkin thanks grawity
13:16 settermjd joined #git
13:19 fuchstronaut joined #git
13:19 anuxivm joined #git
13:20 bongjovi thanks grawity, that was really helpful
13:20 str joined #git
13:21 bongjovi just pushed from the new local to the new remote branch successfully
13:21 rwb joined #git
13:21 al-damiri joined #git
13:21 sangy joined #git
13:21 jceb joined #git
13:22 zarubin joined #git
13:22 ArchNoob joined #git
13:23 rivarun joined #git
13:24 tvw joined #git
13:26 subby joined #git
13:26 beyertech joined #git
13:27 garethdaine joined #git
13:28 beyertech joined #git
13:31 byteflame joined #git
13:33 griffindy joined #git
13:34 LionsMane joined #git
13:35 ash_workz joined #git
13:35 GavinMagnus joined #git
13:36 maucar joined #git
13:37 jaafar joined #git
13:38 danslo joined #git
13:40 Zoxc joined #git
13:41 NwS joined #git
13:41 kbs andrey_utkin: not used syncthing, but it sort of sounds like it's just syncthing doing its thing
13:42 interne7y joined #git
13:42 Dougie187 joined #git
13:43 kbs andrey_utkin: I think fundamentally you'll be happier just using git to sync (i.e., using a distict repo per machine, and push/pull to the other when you switch) but I can't help but wonder if maybe running a git-repack before you switch might work better with how syncthing works
13:43 anonnumberanon joined #git
13:44 wrouesnel1 joined #git
13:44 star_prone joined #git
13:45 star_prone joined #git
13:45 vassagus joined #git
13:46 porton joined #git
13:47 porton Any way to search a Git repository? (both current and past revisions)
13:47 moritz porton: what do you want to search for?
13:47 selckin git log -S
13:47 moritz for current, git grep (maybe)
13:47 porton moritz: the word "vector"
13:47 andrey_utkin kbs: i want to use syncthing to obtain extra handiness in case of e.g. power failure on stationary PC, or having to move away grabbing just a laptop, and also to avoid fetching news from remotes on 10+ different repos on both of my workstations (gonna become three of them soon)
13:48 geekbri joined #git
13:48 synthroid joined #git
13:49 kbs andrey_utkin: understood. I suspect the tradeoff might be slower certain operations on the git side, but I'd be curious if the occasional git repack might make a difference.
13:50 p4trix joined #git
13:50 synthroi_ joined #git
13:50 moritz porton: 'git grep vector', 'git log -S vector -p'
13:51 texinwien_ joined #git
13:53 sarbs joined #git
13:54 sarbs joined #git
13:55 GodGinrai joined #git
13:55 jceb joined #git
13:59 korolev joined #git
14:00 garethdaine joined #git
14:01 Erati joined #git
14:04 tjone270 joined #git
14:05 AaronMT joined #git
14:06 shurnormal joined #git
14:07 l4v2 joined #git
14:07 shurnormal How do you get `git stash` to show the stash hash?
14:07 shurnormal The manpage tells it accepts `git log` arguments, but I can't get no option running.
14:08 fuchstronaut joined #git
14:10 kaldoran joined #git
14:10 MattMaker joined #git
14:10 ResidentBiscuit joined #git
14:11 Noldorin joined #git
14:13 Lyqyd joined #git
14:13 shurnormal Hmm something like `git reflog show --format="%H" stash` will do enough good.
14:14 Darcidride joined #git
14:17 mikecmpbll joined #git
14:18 Darcidride joined #git
14:18 liuzhen joined #git
14:19 jceb joined #git
14:19 phaleth joined #git
14:19 nettoweb joined #git
14:20 spudowiar joined #git
14:20 notebox joined #git
14:22 zarubin joined #git
14:22 MZAWeb joined #git
14:27 BPL joined #git
14:29 thebloggu joined #git
14:29 BPL Hi everyone, anyone could bring some light to this question? http://stackoverflow.com/questions/38746110/problems-cloning-projects-with-cygwins-git . comparing a couple of clones of that project, one with cygwin's git and the other with sourcetree's git, the differences are pretty much clear, http://screencast.com/t/WOHmVv4o6k5 ... question here is, how to "fix" the cygwin's one?
14:31 chll_ joined #git
14:32 hahuang61 joined #git
14:33 mathstuf joined #git
14:33 Guest5 joined #git
14:34 JeroenT joined #git
14:35 notebox joined #git
14:35 GodGinrai BPL: that image on the right doesn't look like cygwin
14:36 drefl joined #git
14:36 BPL GodGinrai: Yeah, that's right, that's conemu command prompt
14:36 tvw joined #git
14:36 vassagus joined #git
14:37 GodGinrai so you're using cygwin git with non-cygwin tools?
14:37 BPL GodGinrai: Yeah, all the time... it's running the cygwin's git though, ie: > where git --> C:\cygwin64\bin\git.exe
14:37 __4nunn4k1 joined #git
14:38 __4nunn4k1 Hi, its possible create a new branch with getting just one file ?
14:38 GodGinrai filesystem is NTFS?
14:38 BPL GodGinrai: Yeah, indeed
14:38 GodGinrai __4nunn4k1: please reword your question.  I don't understand it
14:38 dhollinger joined #git
14:38 subhojit777 joined #git
14:39 GodGinrai BPL: have you tried doing the clone through mintty just to make sure it is not a problem caused by conemu?
14:39 __4nunn4k1 GodGinrai: i want to create a new branch
14:39 GodGinrai (you never know)
14:39 __4nunn4k1 bit i want just one file to the new one
14:39 grawity __4nunn4k1: if you want unrelated histories, use the --orphan option
14:39 BPL GodGinrai: Good question, let me just try that
14:39 GodGinrai __4nunn4k1: "just one file to the new one" makes no sense to me.
14:40 shinnya joined #git
14:40 __4nunn4k1 GodGinrai: u have a branch that have a lot of files, and if you create new branch ... the new will get all the files ... but i want just one .. like config.log
14:41 GodGinrai __4nunn4k1: that's not really how branches are supposed to be used.  Why are you trying to do this?
14:42 __4nunn4k1 GodGinrai: ahhh i fixed =)
14:43 jceb joined #git
14:43 zeroed joined #git
14:43 garethdaine joined #git
14:43 BPL GodGinrai: Ok, confirmed, cloning on mintty was the same result than conemu (both using cygwin's git), here, http://screencast.com/t/cMESGNL1N , the permissions are "screwed up"
14:43 grawity well, sure, the terminal has nothing to do with it anyway
14:44 grawity it just draws text on screen
14:44 grawity but you're using cygwin's git in both cases, so cygwin's git behaves the same
14:44 BPL grawity: exactly
14:44 grawity clone with msysgit instead
14:44 GodGinrai grawity: sure, but I wanted to make sure it wasn't passing weird values to cygwin's git
14:45 GodGinrai you never know
14:45 cdg joined #git
14:46 HappyLoa- joined #git
14:46 BPL grawity: yeah, sure, for the time being i'll be using msysgit... but it'd be really convenient to be able of using cygwin's git without these annoying permission issues
14:47 GodGinrai BPL: http://stackoverflow.com/questions/7048763/how-to-stop-git-from-making-files-non-executable-on-cygwin
14:47 GodGinrai ^ sounds like your exact problem
14:47 BPL GodGinrai: Yeah, indeed... i had read that... but that solution is the same than doing chmod +x on every executable, right? I mean, it doesn't avoid the fact of "screwed up" projects
14:48 MattMaker joined #git
14:49 GodGinrai BPL: according to the docs: "The command honors core.filemode configuration variable. If your repository is on a filesystem whose executable bits are unreliable, this should be set to false (see git-config(1)). This causes the command to ignore differences in file modes recorded in the index and the file mode on the filesystem if they differ only on executable bit. On such an unfortunate filesystem, you
14:50 GodGinrai may need to use git update-index --chmod=."
14:50 le_melomane joined #git
14:51 BPL GodGinrai: Mmm, i see... in any case, in both cygwin's git and sourcetree's i have set core.filemode=false
14:51 armyriad joined #git
14:51 Isla_de_Muerte joined #git
14:51 BPL GodGinrai: Question is, if their config is the same, why are they behaving differently?
14:53 GodGinrai BPL: there might be a patch in SourceTree's git to check to make sure the file permissions were set correctly and if not, reset them
14:53 GodGinrai not sure
14:53 Charliechin joined #git
14:54 BPL GodGinrai: I understand, mmm, right... it seems like there is no trivial solution for this then
14:55 aep-shoutlet joined #git
14:55 eivarv joined #git
14:56 zivester joined #git
14:56 fuchstronaut joined #git
14:56 thiago joined #git
14:57 GodGinrai BPL: if I find anything, I'll let you know
14:57 settermjd joined #git
14:57 GodGinrai but that seems to be the case
14:58 ShekharReddy joined #git
14:59 BPL GodGinrai: Ok, tyvm for your time... if you find the valid answer and you have SO account just post it directly there and you'll earn some good reputation :)
14:59 nicoulaj joined #git
14:59 GodGinrai np
14:59 rns joined #git
15:00 astrofog joined #git
15:03 le_melomane joined #git
15:03 dreiss joined #git
15:04 InfoTest joined #git
15:05 quetz joined #git
15:08 madewokherd joined #git
15:09 Darren_ joined #git
15:10 dmto joined #git
15:10 axl_ joined #git
15:11 andrey_utkin left #git
15:12 star_prone joined #git
15:14 vuoto joined #git
15:15 intellix joined #git
15:16 BSaboia joined #git
15:16 zivester joined #git
15:17 zivester joined #git
15:20 zincrokx joined #git
15:20 cdg joined #git
15:20 linuxmint joined #git
15:21 zincrokx joined #git
15:21 robotroll joined #git
15:21 johnny56 joined #git
15:22 daniel_rose joined #git
15:22 zarubin joined #git
15:22 harish_ joined #git
15:24 ambro718 joined #git
15:25 tyreld joined #git
15:25 HappyLoa- joined #git
15:27 gamer joined #git
15:30 benbergman joined #git
15:30 Lomex joined #git
15:32 vuoto joined #git
15:32 vuoto joined #git
15:33 vuoto joined #git
15:34 phaleth joined #git
15:35 synthroid joined #git
15:37 vuoto joined #git
15:38 Topic for #git is now Welcome to #git, the place for git help and botany | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Nurture your git-twigs and they will grow into a full branch
15:41 sanketdg joined #git
15:42 interne7y joined #git
15:43 mathstuf joined #git
15:43 rominronin joined #git
15:45 crose joined #git
15:46 zincrokx joined #git
15:46 synthroid joined #git
15:46 vuoto joined #git
15:48 eivarv joined #git
15:48 zincrokx joined #git
15:48 WayToDoor joined #git
15:49 t0by joined #git
15:50 cdg joined #git
15:50 TomyLobo joined #git
15:51 vuoto joined #git
15:51 zincrokx joined #git
15:52 zincrokx joined #git
15:53 zivester joined #git
15:53 zincrokx joined #git
15:53 EvilPeng1 joined #git
15:54 zincrokx joined #git
15:54 luc4 joined #git
15:55 zincrokx joined #git
15:56 zivester joined #git
15:56 ctcrnitv joined #git
15:56 texinwien_ joined #git
15:58 catag87 joined #git
15:58 ChristopheT joined #git
15:59 le_melomane joined #git
15:59 crayon joined #git
16:00 netcarver joined #git
16:01 irco joined #git
16:01 ChristopheT left #git
16:04 shirty joined #git
16:05 playfullyExist joined #git
16:05 sanketdg joined #git
16:06 elux joined #git
16:07 JyZyXEL joined #git
16:07 vuoto_ joined #git
16:07 sanketdg joined #git
16:07 Electrometro joined #git
16:11 hkm joined #git
16:12 catag87_ joined #git
16:13 Phrohdoh joined #git
16:13 Phrohdoh Hi all, I've never had this before. http://pastebin.com/raw/1XmAvKiv
16:14 XVar` joined #git
16:14 nanga joined #git
16:15 XVar` left #git
16:15 Phrohdoh my $fh = undef; open($fh, '-|', @_) or die; return <$fh>;
16:16 Phrohdoh It is being set to undef explicitly..
16:16 ilmari that doesn't matter
16:16 grawity open() takes it by reference, setting to a filehandle on successful open
16:16 Phrohdoh ah, ok
16:16 sargas joined #git
16:16 ilmari the problem is that there are too many items in @_
16:17 daniel_rose joined #git
16:18 ilmari what does 'git ls-files . | wc -l' say?
16:18 Phrohdoh :q
16:18 Phrohdoh oops
16:18 Phrohdoh 4715
16:18 Phrohdoh This repo is massive unfortunately
16:18 settermjd joined #git
16:19 ilmari try without the .
16:19 Phrohdoh Ah that worked, thanks.
16:20 ilmari if you specify any files, it gets the list of all tracked files that match that, then passes that to git diff-index
16:20 UTAN_dev_ joined #git
16:21 star_prone joined #git
16:22 UTAN_dev_ joined #git
16:22 zarubin joined #git
16:23 kpease joined #git
16:24 Phrohdoh Thanks ilmari
16:24 livingstn joined #git
16:25 gtristan joined #git
16:25 charlesr joined #git
16:25 le_melomane joined #git
16:26 ilmari 'open my $fh, ...' would be more idiomatic perl
16:26 dmto joined #git
16:30 durham joined #git
16:30 danslo joined #git
16:30 durham joined #git
16:32 netcarver joined #git
16:33 hahuang61 joined #git
16:33 nwmcsween joined #git
16:35 SteffanW joined #git
16:36 howdoi joined #git
16:37 crayon joined #git
16:41 chachasmooth joined #git
16:42 catag87 joined #git
16:42 johnny56 joined #git
16:42 nitric joined #git
16:44 rominronin joined #git
16:45 haribo joined #git
16:46 dreiss joined #git
16:46 DarkFeather joined #git
16:46 DarkFeather Anyone here familiar with cgit?
16:47 mathstuf joined #git
16:50 shmuli joined #git
16:50 InfoTest joined #git
16:50 Derperperd joined #git
16:51 daynaskully joined #git
16:54 Maple__ joined #git
16:55 airdisa joined #git
16:55 jimi_ joined #git
16:57 eivarv joined #git
16:58 DarkFeather left #git
17:01 JyZyXEL joined #git
17:03 shmuli joined #git
17:05 Dyonisos joined #git
17:08 diegoviola joined #git
17:10 satifant joined #git
17:13 mablae joined #git
17:13 sanketdg joined #git
17:14 Erati joined #git
17:15 jimi_ Erati, you in Wilmington by chance?
17:15 mohabaks joined #git
17:15 Erati i am not, but i know guy from there
17:15 jimi_ oh ok, i just saw the nc.res.rr.com (wilmington here)
17:16 Erati raleigh for me :)
17:16 jimi_ oh nice :D
17:16 m1dnight1 joined #git
17:17 veilig2000 joined #git
17:18 LeBlaaanc joined #git
17:19 lvns joined #git
17:19 lvns joined #git
17:20 fairuz joined #git
17:22 zarubin joined #git
17:23 kab joined #git
17:24 Anupkumar joined #git
17:25 Mannequin joined #git
17:26 dhollinger joined #git
17:27 star_prone joined #git
17:27 witquicked joined #git
17:28 witquicked I'm trying to get the short form of a commit hash "git rev-parse HEAD" gives me the long form, but "git rev-parse HEAD --short" gives me the "fatal: Needed a single revision" error
17:29 witquicked what's confusing is why the long form works, but the short form does not
17:29 eivarv joined #git
17:29 iamtakingiteasy joined #git
17:29 tokkee joined #git
17:29 gtristan joined #git
17:30 rgrinberg joined #git
17:31 satifant witquicked, git rev-parse --short HEAD ;)
17:31 witquicked OH. MY. GOD.
17:31 * witquicked slaps himself upside the head with a trout
17:31 witquicked thanks satifant
17:31 satifant yw :)
17:32 ktosiek joined #git
17:33 compeman joined #git
17:38 mostlybadfly joined #git
17:42 nopea joined #git
17:42 poweruser joined #git
17:42 nopea I have a repo on Bitbucket... and on my server I have an empty working dir where I have init git and setup the remote.  How can I pull the contents of the repo to the working dir?
17:42 jknetl joined #git
17:43 rominronin joined #git
17:43 shmuli joined #git
17:43 interne7y joined #git
17:44 SwiftMatt joined #git
17:44 shmuli joined #git
17:45 dmiles joined #git
17:45 dmiles http://pastebin.com/cAGcFuau  how to a get a list of modifed files?
17:46 cdg joined #git
17:46 dmiles line 33 :(
17:46 _ikke_ git diff --name-only
17:47 ELFrederich joined #git
17:47 dmiles weird _ikke_ yeah they are not showing up there either
17:47 satifant --cached ;)
17:47 dmiles --cached  works!
17:47 satifant your files are already staged
17:47 ToBeCloud joined #git
17:48 dmiles yeah i am checking out subdirs with diffenrt versions
17:50 * GodGinrai just throws the output of git-status into awk
17:50 segment-fault joined #git
17:50 dmiles is there a ls-files i could use?
17:50 dmiles this wasnt it:  git ls-files --cached --modified
17:51 dmiles git diff --name-only --cached  worked i'll see if i can make my script work with it
17:51 dmiles zip ${FileStem}.zip $(git diff --name-only --cached)
17:52 ELFrederich I'm doing an import into Git from another system (AccuRev).  I can set the author using "git -c core.name='Someone Else' core.email='selse@example.com' commit -m 'blabla'"... but how can I change the timestamp?
17:52 thiago_ joined #git
17:52 dmiles ok i got my script qorking use git diff instead of ls-files
17:52 GodGinrai what is --cached for?
17:53 GodGinrai I noticed when I made a change to test this, that the modified file wouldn't show up if I used --cached
17:53 _ikke_ GodGinrai: for staged changes
17:53 satifant git diff shows only unstaged changes, while git diff --cached only shows staged changes
17:54 GodGinrai _ikke_: I see
17:54 vuoto joined #git
17:54 kbs ELFrederich: --date
17:54 dmiles i thinking i better use this in my script zip ${FileStem}.zip $(git diff --name-only --cached) $(git diff --name-only)
17:55 dmiles to get both
17:55 Sasazuka joined #git
17:55 GodGinrai dmiles: how about $(git status | awk '/modified/ { print $2 }') ?
17:56 dmiles GodEater that worked for me
17:56 kbs ELFrederich: --date for the author date, and the env variable GIT_COMMITTER_DATE for the commiter date (as there are actually two timestamps in a commit.)
17:57 dmiles i mean pucked up the good stuff
17:57 GodGinrai good good
17:57 segment-fault left #git
17:57 nopea Any way to pull a bitbucket repo into an empty working dir.?
17:58 mikecmpbll joined #git
17:59 _ikke_ nopea: git fetch
17:59 Tachyon_ joined #git
17:59 rpd nopea: git pull?
17:59 shmuli joined #git
17:59 nopea I am SUPER NEW to git - just started today ;_
17:59 rpd so does `git pull` not work?
18:00 rpd bitbucket isn't special afaik
18:00 ToxicFrog nopea: empty working dir that you've initialized as a git repo, or empty directory with nothing in it at all?
18:00 sargas joined #git
18:01 ToxicFrog If it's the latter you want "git clone"; "git pull" and "git fetch" are for downloading updates into an existing repo.
18:01 nopea I have run git init on it
18:01 sargas joined #git
18:01 nopea also git remote add origin (with the URL to my bit bucker repo)
18:01 ToxicFrog nopea: if you just want a local clone of a remote repo, don't bother with git init at all. Just git clone the repo and it'll do everything automatically.
18:01 nitric nopea: you shouldn't run "git init" for this case: init is for when you start a brand new repo, and you're cloning an existing repo
18:01 vuoto joined #git
18:01 _ikke_ nopea: git fetch origin so that you get all the history
18:01 sargas joined #git
18:02 nopea ah so becuase I created a new repo - the one on bit bucket will not work.  I have to clone it?
18:03 vuoto joined #git
18:03 vuoto joined #git
18:03 lvns joined #git
18:03 piling joined #git
18:04 rpd nopea: git clone is just the command to download an existing repo with all history, etc. If you already have a git intialized directory with the remote set, you can just git fetch origin, etc
18:04 m0viefreak joined #git
18:05 vuoto joined #git
18:05 nopea rpd: any method better than the other?
18:05 blackwind_123 joined #git
18:05 _ikke_ nopea: git clone is easier
18:06 _ikke_ Just one step
18:06 rpd nopea: Well, you kinda already did most of the things git clone does anyways. But, you should probably just git clone unless you have some other reasons not to.
18:06 Rodya_ joined #git
18:07 star_prone joined #git
18:07 nopea rpd: thanks clone worked perfectly (other than put it into a directory name that I don't want)
18:07 ToxicFrog There's a command line option for that
18:07 nitric there's a command line option for *everything*
18:07 ToxicFrog Or of course you can just move it afterwards
18:08 nitric nopea: get comfortable with "git help <command>"  :-) the docs are great
18:08 nopea nitric: cheers - still very green so I should read up more :)
18:08 Sucks joined #git
18:09 lvns joined #git
18:09 vuoto joined #git
18:10 nitric nopea: https://git-scm.com/doc is a better starting point, "git help" is a great reference, but not so great for learning
18:10 sanketdg joined #git
18:10 _ikke_ !book
18:10 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
18:12 nopea rpd: interesting..... git fetch origin retrieves the repo, but after the command runs, the work dir is still empty.
18:12 Synthead joined #git
18:13 _ikke_ nopea: yes, it only downloads the history
18:13 _ikke_ nopea: You need to create and checkout a local branch
18:14 nopea ikke: cheers.  Does the local branch have to be the same as the one on bitbucket?
18:15 vuoto joined #git
18:16 shmuli joined #git
18:16 dreiss joined #git
18:16 kadoban nopea: For the shortcut command 'git checkout somebranch' to work, and create a local branch for you that tracks the remote tracking branch, yes.
18:17 kadoban If you do a more complicated checkout -b or 'git branch' command, you have more flexibility ... but then you have to specify more annoying stuff.
18:17 kadoban (It's not really that hard, but ... usually you want the name the same anyway)
18:17 nopea kadoban: much appreciated.  I will have a look
18:18 endiruna joined #git
18:18 kadoban The shortcut only works if you only have *one* remote that has a branch of that name, and no local branch of that name too. Just to cover all the bases.
18:18 b1tchcakes joined #git
18:19 nopea kadoban: cheers... I just did 'git checkout master' then ran git fetch origin again and that worked.  I can see the files again
18:20 _ikke_ running git fetch again does nothing
18:21 nopea so they are already there one I create a branch?
18:21 _ikke_ yes
18:22 _ikke_ it's the checkout that puts the files in your working tree
18:22 nopea good to know ;-)  cheers again folks
18:22 zarubin joined #git
18:22 veilig2000 joined #git
18:24 Sasazuka joined #git
18:24 kbs highly recommend /msg gitinfo !bottomup :-) I've come to the conclusion there's really no other sane way to understand git
18:24 gitinfo 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
18:25 nopea kbs: cheers - I will have a look at that
18:26 eivarv joined #git
18:27 MattMaker joined #git
18:28 shmuli joined #git
18:28 daniel_rose joined #git
18:28 daumie254 joined #git
18:29 _xor joined #git
18:31 danslo_ joined #git
18:32 MattMaker joined #git
18:34 hahuang61 joined #git
18:34 lvns joined #git
18:35 nopea Thanks again guys! I think I understand a lot more than I did 30 min ago ;)
18:36 dsantiago joined #git
18:36 Nevik joined #git
18:37 fairuz joined #git
18:37 peroht joined #git
18:38 lvns_ joined #git
18:38 terminal_echo joined #git
18:38 terminal_echo i'm doing git pull and getting public key denied message
18:39 terminal_echo i've added my public key to github?
18:39 WayToDoor joined #git
18:40 ToxicFrog terminal_echo: you're using git as the username? You're presenting the right key?
18:40 kadoban terminal_echo: ssh git@github.com   see if it thinks you're anyone.
18:41 terminal_echo do I need to generate a public key on the server and add this?
18:41 terminal_echo or is it good enough to add my local computer's public key to the authorized keys on the server?
18:41 terminal_echo i'm not using it as the username
18:42 kadoban You generate a keypair ... anywhere, or already have one. You put the public key in your github settings in the right place
18:42 terminal_echo okay, but then when you ssh into another server and do git pull
18:43 terminal_echo how does that server know to use that key?
18:43 _ikke_ terminal_echo: ssh-agent
18:43 _ikke_ You need to set that up
18:43 ResidentBiscuit joined #git
18:44 ResidentBiscuit joined #git
18:44 rominronin joined #git
18:44 jost joined #git
18:45 ahmedelgabri joined #git
18:48 kfunk joined #git
18:55 dreiss joined #git
18:57 star_prone joined #git
18:58 Vynn joined #git
18:59 lvns joined #git
19:00 _sjs joined #git
19:00 nopea joined #git
19:01 orbitphreak joined #git
19:02 Rodya_ joined #git
19:03 ahmedelgabri joined #git
19:04 jeremyhall joined #git
19:04 lvns_ joined #git
19:05 fairuz joined #git
19:05 Lauven joined #git
19:06 rahtgaz joined #git
19:06 axl_ joined #git
19:07 crayon joined #git
19:07 netj joined #git
19:09 titanium17 joined #git
19:10 gargola joined #git
19:12 dreiss joined #git
19:14 msonntag joined #git
19:17 xall joined #git
19:19 jayc joined #git
19:20 Ravana joined #git
19:27 cdown joined #git
19:29 al-damiri joined #git
19:29 nopea is there a way to check what git is ignoring?
19:30 star_prone joined #git
19:31 preilly joined #git
19:31 nopea found it
19:33 axl_ joined #git
19:34 armyriad joined #git
19:34 rahtgaz after renaming a local branch with -m, how should I proceed to make this change know to origin?
19:34 Fissure joined #git
19:34 wwwi joined #git
19:35 Spec-Chum joined #git
19:37 rahtgaz to be clear, the branch had been already pushed to origin. But was now renamed on my local copy
19:38 nwkj86 joined #git
19:38 Sazhen86 joined #git
19:41 nitric rahtgaz: delete it from the origin and re-push with the new name
19:43 byteflame joined #git
19:43 rahtgaz nitric, thank you. I just did and it's now ok. But one last question: could I have deleted it from origin locally? I had to go to origin and issue the delete command there because I can't seem to find how to delete a branch remotely
19:44 nitric rahtgaz: the syntax for deleting a remote is a bit odd: "git branch -d :branch-name" (note the colon in front of the branch name, this means "the branch on the remote")
19:45 nitric s/a remote/a remote BRANCH/
19:45 rahtgaz oh! excellent. Thank you :)
19:45 mozzarella joined #git
19:45 rominronin joined #git
19:46 amalon joined #git
19:46 piling_ joined #git
19:47 mozzarella joined #git
19:47 amalon left #git
19:50 Geo joined #git
19:50 blocky joined #git
19:51 blocky can someone explain why interactive rebase doesn't preserve merge commits by default?
19:51 vuoto joined #git
19:51 Geo Is there anything 'special' beyond --use-mailmap I need to do with git log, in order to use the .mailmap file? It's not using it as I run it now
19:51 ambro718 joined #git
19:54 mikecmpbll joined #git
19:55 Erati joined #git
19:56 kaldoran joined #git
19:56 rgrinberg joined #git
19:59 netj joined #git
19:59 kadoban blocky: IIUC, --preserve-merges and --interactive is a funky combination. If you start changing the order of commits, it's hard to understand what's going on. The manpage mentions that in BUGS. I don't really know many details beyond that though.
19:59 kadoban The --preserve-merges stuff is ... complicated and hard to understand.
20:00 armyriad joined #git
20:03 nilg joined #git
20:04 fairuz joined #git
20:06 l4v2 my master branch is ahead of my second branch, how can I get an updated file off of master onto 2nd branch. Thank you.
20:06 jhack joined #git
20:06 jhack left #git
20:07 bongjovi joined #git
20:07 GenZai joined #git
20:08 kadoban l4v2: merge master into second, rebase second onto master, cherry-pick the commit(s) that update the file you're talking about, or 'git checkout master -- the_file' and then stage and commit if you want. All depends on what you want history to look like.
20:10 alipoor90 joined #git
20:11 alipoor90 is there any difference between `git add` and `git add -A` in most recent versions?
20:11 alipoor90 or the `-A` option is the default?
20:12 Geo left #git
20:14 bongjovi joined #git
20:16 FuzzySockets joined #git
20:17 callmeDarwin joined #git
20:18 Guest86795 left #git
20:22 zarubin joined #git
20:23 Geo joined #git
20:24 Geo Hi, I'm looking at using git log to show a range, but having trouble finding the syntax to specify "current commit to X commit"... does anyone know? and by current, I mean 'the current', not 'the current using the SHA'
20:24 felipe joined #git
20:24 moritz Geo: it's spelled HEAD
20:24 lb Geo man gitrevisions
20:24 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
20:25 lb git log sha1234..HEAD
20:25 lb e.g.
20:25 Geo i was doing it backwards.
20:26 Geo there we go
20:26 Geo thank you
20:26 felipe joined #git
20:26 lb Geo for diffing branches i prefer the syntax git log branch1 ^branch2
20:26 lb read: show me what's in branch1 that's not in branch2
20:28 crose joined #git
20:28 Tachyon_ joined #git
20:28 freimatz joined #git
20:30 Geo thanks
20:32 danslo_ joined #git
20:33 Vynn I have an unconventional svn repo that I'm trying to migrate to git using git-svn. When it was created, multiple individual projects were placed under a single trunk folder at the root of the repository. Later on, the single trunk folder was removed and each project given its own branches, tags, and trunk folder. (so the trunk folder has had different scopes) Git-svn will pick up the history post-change but not before.
20:33 Vynn Is there a better way to migrate the source history for these projects other than creating a git-svn repo, fetching each relevant revision to the project(possibly with an include-path to filter out changes outside the project scope), skipping the revision that changes the structure, manually making that change in the destination git repository, and then fetching the rest of the changes?
20:33 Geo so, this is interesting.. if I'm trying to find the most recent release, git describe --abbrev=0 --tags returns me 1.6.20. However, 1.6.21 was tagged a year later- why is it giving me .20, and what could I do to fix that?
20:34 Geo (the goal is to find the most recent tag)
20:34 hahuang61 joined #git
20:34 armyriad joined #git
20:35 SwiftMatt joined #git
20:35 Seveas Geo: probably 1.6.20 is reachable via fewer commits (e.g. a side branch made one commit on top of 1.6.20 and was merged just now)
20:35 Geo ah
20:35 Geo is there anyway to do date-based matching?
20:35 Seveas newer git versions handle this better, there were some discussions/patches recently about this
20:36 Seveas commit 9ee8f9409cab2a52e133c63bdd0acce24f99e73f, git 2.8.4
20:41 jstimm joined #git
20:42 sdothum joined #git
20:43 perlpilot Geo: git also has an annoying habit of ordering tags alphabetically-ish, so that if you tag a single commit twice, you only get the first alphabetical tag with "git describe --tags" no matter if the it is the "most recent" or not.
20:45 vassagus joined #git
20:45 perlpilot one of these days I'm going to care enough to look at how git-describe decides which is the "most recent tag"
20:46 rominronin joined #git
20:47 MadLamb joined #git
20:48 Rikairchy joined #git
20:48 loglaunch left #git
20:51 lvns joined #git
20:53 vassagus joined #git
20:54 fairuz joined #git
20:57 _kfpratt joined #git
20:57 Khisanth joined #git
20:58 endiruna joined #git
20:59 aidalgol joined #git
20:59 usm4n joined #git
21:02 ozette joined #git
21:02 dsantiago joined #git
21:04 star_prone joined #git
21:04 _28_ria joined #git
21:04 sdothum joined #git
21:04 Marbug_ joined #git
21:04 blocky left #git
21:05 vassagus joined #git
21:06 vassagus joined #git
21:08 maroloccio joined #git
21:08 dsdeiz joined #git
21:10 inflames joined #git
21:12 jaequery joined #git
21:12 garethdaine_ joined #git
21:13 usm4n joined #git
21:15 MattMaker joined #git
21:15 leeN joined #git
21:16 xall joined #git
21:20 efdetonator joined #git
21:21 spudowiar joined #git
21:24 jayc joined #git
21:25 _August_ joined #git
21:26 _August_ I made a commit but i forgot to add one of my files to it, is there a way to add additional files to that commit or do i have to do a new commit?
21:26 MadLamb joined #git
21:28 rpd _August_: rebase
21:28 _August_ rebase and then do the commit again?
21:29 rpd yeah, do rebase -i, then edit that commit and add the file to the commit before fastforwarding
21:32 _August_ ok
21:33 mattcen joined #git
21:33 usm4n joined #git
21:36 vassagus joined #git
21:36 Dougie187 left #git
21:36 vassagus joined #git
21:38 ahr3n joined #git
21:43 kadoban _August_: Was it the last commit? You can make whatever changes you want to include, stage them and do 'git commit --amend' if so.
21:44 _August_ yeah just did it
21:44 _August_ thanks
21:44 cyan__ joined #git
21:45 _August_ git commit --amend --no-edit filename is what i used
21:45 interne7y joined #git
21:45 beyertech joined #git
21:47 beyertech joined #git
21:47 rominronin joined #git
21:48 Geo left #git
21:48 beyertech joined #git
21:49 kaldoran joined #git
21:50 tim001 joined #git
21:50 tim001 hi all
21:50 gitinfo tim001: 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.
21:51 tim001 i just installed git 2.9.2 on windows 10 pro
21:51 kevlarman joined #git
21:51 tim001 and i'm getting a permissions error on my config file
21:51 tim001 it's pointing to a c/programdata location that doesn't exist
21:52 tim001 i haven't found anything on google with the same problem, but i could be searching wrong
21:52 tim001 $ git config -l => fatal: unable to access 'C:\ProgramData/Git/config': Permission denied
21:53 tim001 does anybody have an idea on how to fix this?
21:56 WaReZ joined #git
21:56 Geo joined #git
21:59 cd-rum joined #git
22:00 LeBlaaanc joined #git
22:03 cd-rum_ joined #git
22:05 tim001 i'll try again later, thanks!
22:06 NeverDie joined #git
22:08 spudowiar joined #git
22:09 Geo left #git
22:10 cdg joined #git
22:14 _August_ joined #git
22:15 netj joined #git
22:22 zarubin joined #git
22:23 SwiftMatt joined #git
22:23 jeffreylevesque joined #git
22:25 zumba_addict joined #git
22:25 tax joined #git
22:30 shmuli joined #git
22:31 EvilPeng2 joined #git
22:34 danslo_ joined #git
22:34 rkazak joined #git
22:35 star_prone joined #git
22:35 hahuang61 joined #git
22:37 shmuli joined #git
22:38 spudowiar joined #git
22:39 rlb joined #git
22:41 shmuli joined #git
22:44 magicTurtle joined #git
22:44 rlb I'm dealing with a project that regularly merges the stable branch to the master branch, *and* the reverse (master -> stable).  Stable was just merged to master, and I was trying to figure out how to ask git log for all the changes in the master branch that were not in either the latest master release or the latest stable release.
22:45 rlb And is bidirectional merging like that common or uncommon?
22:48 cdown joined #git
22:48 rominronin joined #git
22:49 cdown joined #git
22:51 rpd rlb: you can pass a commit range to git log
22:52 rlb rpd: if you mean like "git log LAST_STABLE_VER..master", that ends up including a lot of stuff on stable before LAST_STABLE_VER, I'm guessing because of the frequent bidirectional merges?
22:52 zumba_ad_ joined #git
22:53 sdothum joined #git
22:58 wwwi joined #git
22:58 n-st joined #git
22:59 rlb Ideally, I'd like to exclude every commit on stable before LAST_STABLE_VER from the log "no matter what".
23:00 nitric rlb: do you just want commits in master that aren't in stable yet....? if so, "git log master ^stable"
23:04 dx left #git
23:05 rpd rlb: well I meant like "git log LAST_STABLE_VER..LAST_MASTER_RELEASE_VER"
23:05 rlb nitric: hmm, thanks I'll see.
23:06 rlb also need to check again that I'm not misinterpreting the result...
23:06 Derperperd joined #git
23:08 ISmithers joined #git
23:08 dsdeiz joined #git
23:08 dsdeiz joined #git
23:09 sdothum joined #git
23:11 kyan joined #git
23:15 xlegoman joined #git
23:16 rkazak joined #git
23:18 EvilPeng2 joined #git
23:19 Electrometro joined #git
23:21 d0nn1e joined #git
23:22 Noldorin joined #git
23:22 zarubin joined #git
23:23 dreiss joined #git
23:24 coldswitch joined #git
23:26 anuxivm joined #git
23:29 jfelchner joined #git
23:29 zumba_addict joined #git
23:32 Lunatrius` joined #git
23:33 linuxmint joined #git
23:34 mischat joined #git
23:37 sdothum joined #git
23:37 star_prone joined #git
23:41 shmuli joined #git
23:43 shmuli joined #git
23:43 markgrady joined #git
23:44 shmuli joined #git
23:45 shmuli joined #git
23:46 interne7y joined #git
23:47 fahadash joined #git
23:48 ShekharReddy joined #git
23:48 shmuli joined #git
23:49 Ahmed90 joined #git
23:50 rominronin joined #git
23:50 byteflame joined #git
23:51 govg joined #git
23:54 zumba_addict joined #git
23:55 shmuli joined #git
23:55 owen1 joined #git
23:56 shmuli joined #git
23:56 owen1 i want to bring master branch to a specific tag. how do i do that? (i don't care about the commits that are after that tag)
23:56 fairuz joined #git
23:59 kbs left #git
23:59 stormlrd joined #git
23:59 mablae_ joined #git

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