Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-03

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

All times shown according to UTC.

Time Nick Message
00:00 memfrob git am --abort might have worked.
00:00 memfrob yep!
00:01 MistahKurtz joined #git
00:02 nowhereman joined #git
00:03 matoro joined #git
00:04 theoceaniscool joined #git
00:05 energizer1 joined #git
00:06 MistahKurtz I have a branch, A, which branch B was forked from some time ago for a big refactor. A is going to end up tossed out (rather than merging or rebasing B back on top of it). Some hotfix commits were made to A, and I would like to apply those to B. Unfortunately as a part of that refactor, files were reorganized... so `git cherry-pick` doesn't apply cleanly, because it doesn't match up with the files
00:06 MistahKurtz what would be the best way to apply those diffs to the files in branch B?
00:07 efco joined #git
00:08 Derperperd joined #git
00:08 Vampire0 MistahKurtz, try with `-X find-renames=xx%` to lower the threshold to which renames are detected, so that your moved files get found while cherry-picking
00:11 Es0teric joined #git
00:11 xaviergmail joined #git
00:12 MistahKurtz damn, even with `git cherry-pick -n -X find-renames=1%` it still has files saying `deleted by us` @Vampire0
00:12 theoceaniscool joined #git
00:13 memfrob Uhmm, I made a typo in one of my previous commits, how to amend a local commit from 3 commits ago (not HEAD/ tip) ?
00:13 Ekho joined #git
00:13 MistahKurtz maybe using format-patch and then editing the patch manually to point to the new file path would be best? I'm looking at http://stackoverflow.com/a/32844015/193494
00:13 MistahKurtz I've never used git format-patch or git am
00:14 memfrob MistahKurtz, I'm going to go on a wild guess and try 01% as it may think that 1 = 10 ?
00:14 Vampire0 MistahKurtz, you can also serialize the commits to cherry-pick with man git format-patch, then change the paths to the new ones in the patch file and then apply the patch to the target branch with man git am
00:14 gitinfo MistahKurtz: the git-format-patch manpage is available at http://jk.gs/git-format-patch.html
00:14 gitinfo MistahKurtz: the git-am manpage is available at http://jk.gs/git-am.html
00:14 shakalaka joined #git
00:14 Vampire0 memfrob, no, 1 would be 10 percent, but 1% is 1%
00:14 MistahKurtz cool, thank you! giving it a shot..
00:15 Vampire0 memfrob, and to your question, man git rebase and search for interactive.
00:15 gitinfo memfrob: the git-rebase manpage is available at http://jk.gs/git-rebase.html
00:15 Vampire0 memfrob, `git rebase @~4` and then reword or edit for the commit in question, depending on whether you meant a file or the message
00:16 Ariadeno joined #git
00:17 memfrob Beautiful, thanks!
00:18 memfrob I've just been afraid of rebasing since I messed it up before but I'm getting a bit used to it now.
00:19 memfrob Now how do I get back to HEAD?
00:19 BPL joined #git
00:19 BPL Hi everyone
00:19 memfrob Hello!
00:20 sarp joined #git
00:20 BPL let's say i got a python project where i run my unittests like 'python -m unittest discover -s tests -p "test_*.py"' , is it possible to check whether all tests have passed before commiting?
00:20 memfrob Oh git rebase --continue
00:20 Gsham joined #git
00:20 wloncom joined #git
00:22 rwp BPL, Before committing? You mean something a pre commit hook script would check and prevent the commit?
00:22 cdg joined #git
00:23 BPL rwp: Yeah, that's was the meaning of my original question... although i'm reading this http://stackoverflow.com/a/18083375/3809375 and it seems like it's not a good idea
00:23 BackEndCoder joined #git
00:25 nickabbey joined #git
00:35 danimal2 joined #git
00:38 __builtin joined #git
00:40 sarp joined #git
00:46 canuk joined #git
00:46 a_thakur joined #git
00:46 dviola joined #git
00:47 msonntag joined #git
00:49 SwiftMatt joined #git
00:49 Gsham joined #git
00:50 InfoTest joined #git
00:53 matoro joined #git
00:54 hahuang65 joined #git
00:55 Vampire0 BPL, well, if you do it for you to force you to do clean work, go on. If you want to enforce this onto others, they will hate, you kill you and additionally or alternatively simply delete the hook. It is their local repository, they can do what they want with it
00:55 a_thakur_ joined #git
00:56 BPL Vampire0: Yeah... so, what hooks would you recommend me to look at?
00:57 cdown_ joined #git
00:58 BenderRodriguez joined #git
00:59 mizu_no_oto joined #git
01:01 a_thakur joined #git
01:01 Gsham joined #git
01:02 adino joined #git
01:02 ecuanaso joined #git
01:07 arescorpio joined #git
01:10 Vampire0 BPL, man githooks
01:10 gitinfo BPL: the githooks manpage is available at http://jk.gs/githooks.html
01:13 red82 joined #git
01:13 a_thakur joined #git
01:14 harry1 joined #git
01:17 dreiss joined #git
01:20 a_thakur joined #git
01:20 CussBot joined #git
01:26 _raynold_ joined #git
01:26 hahuang62 joined #git
01:26 gugah joined #git
01:32 jstimm joined #git
01:35 dsdeiz joined #git
01:37 red82 joined #git
01:40 spacekitteh joined #git
01:40 spacekitteh has there ever been any work to make git use better compression? e.g. by using the Squash lib?
01:41 ozmage joined #git
01:44 rubyonrailed joined #git
01:48 Gsham joined #git
01:50 Vampire0 spacekitteh, Git has already absolutely fantastic compression, don't you think?
01:50 spacekitteh nope
01:50 InfoTest joined #git
01:50 spacekitteh DEFLATE is a pretty awful compression method
01:52 mohabaks joined #git
01:52 Sasazuka joined #git
01:53 rwp Compression metrics are very data dependent. Git is "good" for source code text text files. And also very fast.
01:53 LeBlaaanc joined #git
01:53 pur3eval joined #git
01:55 spacekitteh rwp: eh, it's -okay- i guess, but there are much better compression methods for source code these days
01:56 spacekitteh rwp, vampire0: brotli, for example, provides a higher compression ratio for about the same compression speed
01:58 nickabbey joined #git
01:58 AustinMatherne joined #git
01:59 spacekitteh modern compression algorithms like the PAQ series are super awesome too when you use appropriate filters
02:02 joshszep joined #git
02:04 joshszep joined #git
02:07 vraju joined #git
02:08 imMute joined #git
02:09 pks joined #git
02:10 jstimm joined #git
02:10 Sergio965 joined #git
02:11 Sergio965 Hi all. I'm having a wild issue with git.
02:11 Sergio965 In my `.gitignore`, I have the line `TODO`
02:12 Sergio965 Nevermind.
02:12 gugah joined #git
02:12 _pix_ joined #git
02:15 raijin joined #git
02:16 ppppp5 joined #git
02:16 finalbeta joined #git
02:17 blackwind_123 joined #git
02:17 ayogi joined #git
02:20 pur3eval joined #git
02:21 griffindy joined #git
02:24 InfoTest joined #git
02:24 wiesel joined #git
02:24 xaviergmail_ joined #git
02:25 Gsham joined #git
02:26 basiclaser joined #git
02:28 energizer1 left #git
02:30 BPL joined #git
02:31 texasmynsted_ joined #git
02:33 Vampire0 spacekitteh, I guess if you want to discuss seriously about this you have to switch to the mailing list where such stuff should be discussed
02:33 ecuanaso joined #git
02:37 spacekitteh true
02:38 vraju joined #git
02:40 chipotle joined #git
02:40 wiesel joined #git
02:41 solenodic joined #git
02:41 msonntag joined #git
02:42 Vampire0_ joined #git
02:46 spacekitteh left #git
02:46 ozmage joined #git
02:46 texasmynsted joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and alternative commits | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-slushie: submit your best punch line to https://madeitwor.se/git-jokes
02:50 Gsham joined #git
02:50 memfrob Is it possible to create / squeeze a commit in between another commit you made in the past?
02:51 dirtyroshi joined #git
02:51 ecuanaso joined #git
02:52 rewt yes, but only by rewriting history
02:52 memfrob This is a local tree so that's not a problem as long as I can preserve the commits after that as well.
02:53 rubyonrailed joined #git
02:53 memfrob I can do it by deleting all the commits after that, but I want to save those and basically just go back in time and add 2 commits
02:54 rewt an easy way is to go to the commit that's still good, make new commits there, and rebase everything else after the newly added commits
02:54 Foxhoundz joined #git
02:55 memfrob go git checkout <commit> make the comments, then git rebase <HEAD of before I did the git checkout command>
02:55 memfrob /s/comments/commits/
02:55 memfrob s/go/so/
02:55 lightstalker joined #git
02:56 rewt yeah, something like that
02:56 memfrob I'm worried about losing my new commits XD
02:56 memfrob like the ones after that I mean
02:56 memfrob Eh I can copy .git and try it out
02:56 rewt git keeps an 'original' branch when you rebase, so you can go back to it
02:57 rewt or yeah, you can clone the repo into another dir
02:57 memfrob git checkout <commit> doesn't delete your history after said commit?
02:57 rewt i also like to use gitk to visually see what's going on
02:57 rewt no, it just moves HEAD to that commit and makes your working tree match that commit
02:57 memfrob Oh right, git reset --hard <commit> does that
02:58 rewt yeah, that one moves your current branch pointer
02:58 memfrob pointer?
02:58 memfrob Oh right, the thingy in branch -a
02:58 rewt branches are nothing more than pointers in git
02:58 rewt they point to a specific commit
02:58 PerlJam pointers that move
02:59 rewt yes
02:59 memfrob PerlJam, nice handle!
02:59 PerlJam heh ... I've only had it for about 23 years  :)
02:59 memfrob That's how old I am!
02:59 PerlJam yeah, I'm ancient
02:59 aavrug joined #git
03:01 ecuanaso joined #git
03:03 harry1 joined #git
03:03 CrypticGator joined #git
03:03 memfrob It's crazy how quiet this channel is compared to literally every single other channel with about the same number of users.
03:04 PerlJam It's only quiet sometimes.
03:04 memfrob Like unless I'm talking it's pretty dead XD
03:05 memfrob Thank you everyone for all the help too, I'm having a blast porting about a hundred patches to LTS kernels.
03:05 memfrob LTS kernels need more TLC
03:06 cyberz joined #git
03:07 mehola joined #git
03:08 fstd_ joined #git
03:12 ecuanaso joined #git
03:15 almy joined #git
03:18 Vortex34 joined #git
03:19 cyberz joined #git
03:20 rubyonrailed joined #git
03:21 sunri5e joined #git
03:22 ecuanaso joined #git
03:26 vraju joined #git
03:27 blackwind_123 joined #git
03:28 kent\n joined #git
03:28 seni joined #git
03:30 amagawdd joined #git
03:30 BenderRodriguez joined #git
03:32 aw1 joined #git
03:32 ozmage joined #git
03:32 cyberz joined #git
03:33 jstimm joined #git
03:35 blackwind_123 joined #git
03:37 jameser joined #git
03:38 mohabaks joined #git
03:40 duderonomy joined #git
03:42 salamanderrake joined #git
03:44 Goplat joined #git
03:46 cyberz joined #git
03:49 BenderRodriguez joined #git
03:51 chachasmooth joined #git
03:53 solenodic joined #git
03:54 a_thakur joined #git
03:55 cyberz joined #git
03:55 blunaxela joined #git
03:56 hexagoxel joined #git
03:57 pur3eval joined #git
03:59 netj joined #git
03:59 ozmage_ joined #git
04:00 cyberz joined #git
04:00 brent__ joined #git
04:00 dermoth joined #git
04:02 Derperperd joined #git
04:05 arescorpio joined #git
04:06 matoro joined #git
04:07 vraju joined #git
04:07 brent__ joined #git
04:07 cdg_ joined #git
04:08 vraju left #git
04:09 cyberz joined #git
04:09 BenderRodriguez joined #git
04:11 d^sh joined #git
04:11 redhedded1 joined #git
04:13 salamanderrake joined #git
04:13 brent__ joined #git
04:13 govg joined #git
04:17 cdg joined #git
04:18 PaulCape_ joined #git
04:18 cyberz joined #git
04:19 Anja joined #git
04:22 pur3eval joined #git
04:22 mehola joined #git
04:25 dreiss joined #git
04:25 red82 joined #git
04:26 jost joined #git
04:26 jon-mac joined #git
04:31 pks joined #git
04:32 diget joined #git
04:33 a_thakur joined #git
04:33 fuzzybear joined #git
04:33 z3t0 joined #git
04:33 bill99 joined #git
04:36 vraju joined #git
04:37 vraju joined #git
04:38 cyberz joined #git
04:38 phroa joined #git
04:42 MrMojit0 joined #git
04:42 sargentmki joined #git
04:43 thebinary joined #git
04:44 UserOO7 joined #git
04:44 svm_invictvs joined #git
04:45 Gsham joined #git
04:46 Ariadeno joined #git
04:46 cyberz joined #git
04:47 BenderRodriguez joined #git
04:48 ayogi joined #git
04:52 harry1 joined #git
04:53 pioiytr_ joined #git
04:54 cyberz joined #git
04:55 sbulage joined #git
04:56 solenodic joined #git
04:57 Cabanoss- joined #git
05:03 xall joined #git
05:03 Ekho joined #git
05:04 pur3eval joined #git
05:07 sargentmki_ joined #git
05:08 jstimm joined #git
05:10 Limes joined #git
05:12 InfoTest joined #git
05:13 bocaneri joined #git
05:17 adino joined #git
05:19 miczac joined #git
05:22 pur3eval joined #git
05:25 ckruczek joined #git
05:30 howdoi joined #git
05:31 pks_ joined #git
05:32 justan0theruser joined #git
05:40 menip joined #git
05:40 bocaneri joined #git
05:45 Thorn joined #git
05:53 Anuj_ joined #git
05:54 matsaman joined #git
05:57 thiago joined #git
06:00 freimatz joined #git
06:01 bannakaffalatta joined #git
06:02 nevodka joined #git
06:04 svm_invictvs joined #git
06:04 freimatz joined #git
06:05 rewt`` joined #git
06:07 thiago joined #git
06:11 cyberz joined #git
06:11 pur3eval joined #git
06:11 brent__ joined #git
06:12 rscata joined #git
06:13 dec0n joined #git
06:15 sargentmki joined #git
06:15 voidspacexyz joined #git
06:15 jstimm joined #git
06:17 mohabaks joined #git
06:17 oskarkv joined #git
06:17 MineCoins joined #git
06:19 solenodic joined #git
06:22 sim590 joined #git
06:23 kaldoran joined #git
06:24 wiesel joined #git
06:26 fletom joined #git
06:32 sbulage joined #git
06:34 overlord_tm joined #git
06:35 qt-x joined #git
06:38 freimatz_ joined #git
06:39 ozmage joined #git
06:40 acetakwas joined #git
06:41 harry1 joined #git
06:43 mohabaks_ joined #git
06:45 sbulage joined #git
06:46 imnik joined #git
06:46 lindenle joined #git
06:47 lindenle joined #git
06:48 imnik left #git
06:48 xall joined #git
06:50 lewix joined #git
06:50 lewix how do i change the commit
06:51 lewix i have a commit i cannot access with git rebase -i commit
06:51 ThomasLocke joined #git
06:51 ThomasLocke joined #git
06:55 uebera|| joined #git
06:55 uebera|| joined #git
06:56 elect_ joined #git
06:58 dersand joined #git
06:59 freimatz3 joined #git
07:02 cyan__ joined #git
07:02 Raging_Hog joined #git
07:03 cyan__ joined #git
07:03 phroa lewix: you actually have to reference that commit's parent in that command
07:03 mda1 joined #git
07:04 phroa (and if the commit you're trying to edit is the first commit in your history, add --root)
07:04 lewix phroa: i have in total three commit
07:04 lewix i want to bring it down to 1
07:04 dreiss joined #git
07:04 cyan__ joined #git
07:04 lewix phroa: and keep today date and stay the author on that 1 commit
07:05 cyan__ joined #git
07:05 phroa iirc; 'git rebase -i --root' then change commits 2 and 3 from 'pick' to 'fixup'
07:05 phroa or 'squash' if you want to keep their messages
07:06 phroa see man git-rebase
07:06 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
07:06 cyan__ joined #git
07:07 lewix phroa: how to i stay the author?
07:08 phroa if you are the author of the first commit, you'll stay the author.  if not, I believe you need to use the GIT_AUTHOR_NAME and *_EMAIL environment variables
07:09 zeroed joined #git
07:09 phroa (or just change that line to 'edit', but don't actually change anything.  or, after it's done, run 'git commit --amend --no-edit' to re-author the commit)
07:10 rubyonra_ joined #git
07:11 nckpz joined #git
07:13 EisNerd joined #git
07:14 sivran joined #git
07:16 WayToDoor joined #git
07:20 wiesel joined #git
07:20 Anja joined #git
07:21 JeroenT joined #git
07:22 chele joined #git
07:25 JeroenT joined #git
07:25 jagob joined #git
07:26 Vortex34 joined #git
07:27 sivran left #git
07:27 jknetl joined #git
07:27 jknetl1 joined #git
07:28 zeroed joined #git
07:28 zeroed joined #git
07:29 King_Hual joined #git
07:31 vraju left #git
07:33 jnavila joined #git
07:40 omniwolf joined #git
07:42 omniwolf Hi, looking for advice on how to overwrite a local branch with a remote branch.  eg i have a local branch called testing, and it has some code.  someone else has made big changes and uploaded them to the remote repo.  if i do a pull it will essentially try and merge the remote code with mine.  i want to just overwrite my local branch completely wit
07:42 omniwolf h the remote version.  can i do this?
07:43 ihradek joined #git
07:45 Murii joined #git
07:46 _ikke_ git fetch
07:46 pks joined #git
07:46 jstimm joined #git
07:46 _ikke_ git checkout -B test <remote>/test
07:47 omniwolf so if my remote thingo is called origin
07:47 omniwolf it would be: git checkout -B testing origin/testing
07:47 _ikke_ yes
07:48 Singmyr joined #git
07:49 Alienpruts joined #git
07:51 mohabaks_ joined #git
07:52 zeroed joined #git
07:52 Darcidride joined #git
07:53 Vortex35 joined #git
07:53 troulouliou_div2 joined #git
07:56 TomyWork joined #git
07:57 Darcidride joined #git
07:57 wiesel joined #git
08:00 navidr joined #git
08:01 DieguezZ joined #git
08:08 jknetl joined #git
08:09 druonysus__ joined #git
08:10 druonysus__ joined #git
08:12 thiago_ joined #git
08:12 Bizkit joined #git
08:14 sarri joined #git
08:14 sarri joined #git
08:15 adino joined #git
08:15 Snugglebash joined #git
08:16 mSSM joined #git
08:18 thierryp joined #git
08:19 omniwolf _ikke_: just doing a bit of reading, i'll probably want to do "git -b testing --track origin/testing" , right?
08:20 ThomasLocke_ joined #git
08:20 ThomasLocke_ joined #git
08:26 sarbs joined #git
08:27 Tobbi joined #git
08:28 jnavila joined #git
08:29 msonntag joined #git
08:29 minn joined #git
08:29 harry1 joined #git
08:35 pkgnei joined #git
08:36 OverCoder joined #git
08:37 danimal2 joined #git
08:38 mikecmpbll joined #git
08:42 basiclaser joined #git
08:42 _ikke_ omniwolf: -B overwrites the branch if it already exists
08:43 omniwolf yeah, but i want tracking to be on, because i want the local testing to be linked to the remote one.. isn't that what the --track option does?
08:44 Balliad joined #git
08:45 lindenle joined #git
08:46 Darcidride joined #git
08:46 _ikke_ yes, correct
08:46 _ikke_ But it should do it by default
08:46 omniwolf oh really
08:46 _ikke_ if you specify a branch to base it off
08:48 solenodic joined #git
08:49 Darcidride joined #git
08:50 djb-irc joined #git
08:52 Balliad joined #git
08:54 Balliad joined #git
08:54 Darcidride joined #git
08:54 kurkale6ka joined #git
08:55 robattila256 joined #git
08:56 blackwind_123 joined #git
08:56 a_thakur joined #git
08:57 osse a remote branch
08:59 joshszep joined #git
09:00 omniwolf _ikke_:  when i do that it says "fatal - a branch name of that name already exists"
09:01 _ikke_ omniwolf: did you use -B?
09:01 khisanth_ joined #git
09:01 _ikke_ osse: right
09:02 omniwolf yep
09:03 ocbtec joined #git
09:03 omniwolf oh. i used lowercase
09:03 omniwolf -b
09:03 omniwolf should be the same right
09:04 Derperperd joined #git
09:04 osse no it should not
09:05 omniwolf ah uppercase is the difference
09:05 osse in recent gits you can also use -bf
09:06 robogoat joined #git
09:06 dsdeiz_ joined #git
09:07 djb-irc joined #git
09:07 mikecmpbll joined #git
09:08 tvw joined #git
09:09 almy joined #git
09:09 mikecmpbll joined #git
09:09 msonntag joined #git
09:13 omniwolf checkout -B doesn't seem to work
09:14 omniwolf it doesn't completely overwrite the local testing branch.
09:14 ispn joined #git
09:14 _ikke_ what do you mean, doesn't completely overwrite?
09:14 _ikke_ What it basically does is force point the test branch to whatever the remote/testing points to
09:15 _ikke_ So there is no 'partial' overwrite
09:15 wiesel joined #git
09:15 omniwolf mm i dunno.  i just tested it out, and the local testing branch is not the same as the remote one
09:15 solenodic joined #git
09:15 canton7 you fetched first, right?
09:15 omniwolf maybe i need to do a "git checkout testing" -> git reset --hard origin/testing"  ??
09:15 howdoi git push origin :head
09:15 howdoi ^ why doesn't this work?
09:16 _ikke_ omniwolf: result should be the same
09:16 _ikke_ howdoi: What do you want to achieve?
09:16 bongjovi joined #git
09:16 howdoi delete the current branch in both remote and local, without mentioning the name of it
09:16 _ikke_ howdoi: head should be capitalized
09:17 canton7 howdoi, then it doesn't work because there's no way of doing what you want in a single command :P
09:17 peepsalot joined #git
09:17 marcogmonteiro joined #git
09:17 tobiasvl howdoi: changing HEAD wouldn't delete the branch that HEAD pointed to anyway
09:18 canton7 and yeah, there's no branch called 'HEAD' on the remote, so git push don't delete it
09:18 clmsy joined #git
09:19 howdoi error: unable to delete 'head': remote ref does not exist
09:19 canton7 yeah, there's no branch called 'head' on the remote
09:19 howdoi yes....but...
09:19 howdoi we can git push -f origin head
09:19 canton7 you can do something like 'git push --delete origin $(git symbolic-ref HEAD)'
09:19 tobiasvl interesting that the error says "remote _REF_ does not exist" though… not "branch"
09:19 canton7 yeah - git push knows how to turn HEAD into the name of a local branch in that case
09:19 canton7 well yeah, you can use git push --delete to delete tags as well
09:20 tobiasvl true
09:20 howdoi I like git push :<>; rather than --delete
09:20 dsdeiz joined #git
09:20 canton7 you do that then /shrug
09:20 tobiasvl but perhaps it shouldn't say that there's no ref by that name when it means there's no branch/tag with that name
09:20 canton7 doesn't make any difference
09:20 howdoi shudder
09:21 overlord_tm joined #git
09:23 zeroed joined #git
09:23 zeroed joined #git
09:24 eroux joined #git
09:25 jnavila joined #git
09:26 Shashikant86 joined #git
09:26 cyberz joined #git
09:27 nostrora joined #git
09:28 aard_ joined #git
09:28 Panacea joined #git
09:28 theoceaniscool joined #git
09:31 wiesel joined #git
09:31 amagawdd joined #git
09:34 cyberz joined #git
09:34 mikecmpb_ joined #git
09:34 omniwolf ps the -B probably did work, there was just some weird issue on the VS IDE where it still saw the old code, even though when inspecting the branch files outside of the IDE they were all correct.  unsure what the issue was
09:35 jstimm joined #git
09:35 robotroll joined #git
09:37 Silenced joined #git
09:37 manuelschneid3r joined #git
09:40 mischat joined #git
09:40 Silenced joined #git
09:43 intellix joined #git
09:43 msonntag joined #git
09:43 matsaman joined #git
09:45 manuelschneid3r joined #git
09:45 chll_ joined #git
09:46 PHPanos joined #git
09:50 cs_shadow joined #git
09:55 dsdeiz joined #git
09:55 dsdeiz joined #git
10:00 g_zen joined #git
10:00 sobersabre joined #git
10:01 coco joined #git
10:04 Shashikant86 joined #git
10:04 Serpent7776 joined #git
10:08 xall joined #git
10:12 achadwick joined #git
10:12 sarbs joined #git
10:14 jstimm joined #git
10:15 jsolano joined #git
10:17 flaviodesousa joined #git
10:17 Tobbi joined #git
10:18 DomeMaster11 joined #git
10:18 DomeMaster11 hello all
10:18 gitinfo DomeMaster11: 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:18 harry1 joined #git
10:19 jozwior joined #git
10:19 DomeMaster11 I have a url for a remote repo in git and I want to find the hash for a branch in the remote repo. Is there a way to specify the url of the repo in the git command so it doesn't look for the current one?
10:19 solenodic joined #git
10:20 DomeMaster11 Something like "git rev-parse origin/master -u http://example.com/myrepo.git"
10:20 DomeMaster11 thanks in advance
10:22 wiesel joined #git
10:23 _ikke_ DomeMaster11: git ls-remote <url> master
10:23 _ikke_ rev-parse only looks at what the current repo has
10:25 geoid_ joined #git
10:26 cdown joined #git
10:27 DomeMaster11 thanks _ikke_
10:29 sobersabre hi. looking at how to extract my current branch parent branch (can be master, can be not).
10:30 sobersabre the immediate parent, i.e. the parent of my branch first commit.
10:30 sobersabre I want to be able to do this without knowing the parent. so filters like --contains master cannot help.
10:31 ferr1 joined #git
10:31 sobersabre I am looking at python's GitPython library. it has Commit and Reference objects.
10:32 JeroenT_ joined #git
10:32 sobersabre Commit only has parents.
10:34 Nilesh_ joined #git
10:34 sobersabre so, I probably will need to go and check whether any branch refs (except my current one) is reachable from current commit during traversal.
10:34 sobersabre Any better ideas ?
10:34 sobersabre I mean traversal -> find parent + run checks -> find parent + run checks.
10:34 sobersabre etc.
10:35 sobersabre it would be wasteful, but will probably work well.
10:36 msonntag joined #git
10:40 pijiu joined #git
10:42 archheretic joined #git
10:43 DieguezZ joined #git
10:43 archheretic Will this **/.idea  ignore the .idea directory that lies in the same directory as .gitignore?
10:43 a_thakur joined #git
10:43 rnsanchez joined #git
10:43 archheretic I guess simply .idea will do the trick
10:44 sarri joined #git
10:44 sarri joined #git
10:46 archheretic hmm
10:46 archheretic apparently not
10:46 grawity either works, as long as the files in .idea aren't in fact already tracked
10:50 muldover joined #git
10:52 mikecmpbll joined #git
10:58 a_thakur joined #git
11:01 vraju joined #git
11:01 Shashikant86 joined #git
11:06 Derperperd joined #git
11:07 PHPanos joined #git
11:07 mohabaks joined #git
11:08 dsdeiz_ joined #git
11:09 Snugglebash joined #git
11:10 coco joined #git
11:10 a0x10c joined #git
11:12 quackgyver joined #git
11:13 JeroenT joined #git
11:18 Shashikant86 joined #git
11:20 jozwior joined #git
11:21 a0x10c joined #git
11:21 mischat_ joined #git
11:21 a0x10c joined #git
11:24 a0x10c joined #git
11:27 qt-x joined #git
11:28 brent__ joined #git
11:33 overlord_tm joined #git
11:33 cdown joined #git
11:36 Bizkit joined #git
11:38 jameser joined #git
11:40 byte512 joined #git
11:40 Snugglebash joined #git
11:43 sarri joined #git
11:44 sarri joined #git
11:44 matsaman joined #git
11:47 JeroenT joined #git
11:47 rvgate joined #git
11:47 mischat joined #git
11:48 wiesel joined #git
11:48 vraju joined #git
11:50 aw1 joined #git
11:50 Cavallari joined #git
11:50 dsdeiz joined #git
11:50 safe joined #git
11:52 ertesx joined #git
11:53 ozmage joined #git
11:53 jaeckel joined #git
11:54 JeroenT joined #git
11:55 NeverDie joined #git
11:56 mgver joined #git
11:58 Silenced_v2 joined #git
11:58 Silenced_v2 joined #git
12:01 ayogi joined #git
12:01 Shashikant86 joined #git
12:05 Tobbi joined #git
12:06 jaeckel joined #git
12:06 Snugglebash joined #git
12:07 harry1 joined #git
12:09 leeN joined #git
12:10 WayToDoor joined #git
12:11 d-fence_ joined #git
12:15 [0xAA] joined #git
12:16 dodobrain joined #git
12:17 mgver joined #git
12:19 jozwior joined #git
12:19 [0xAA] joined #git
12:20 dodobrain joined #git
12:20 [0xAA] joined #git
12:22 Skreader joined #git
12:22 Skreader left #git
12:26 cdg joined #git
12:29 vraju joined #git
12:31 xaviergmail_ joined #git
12:31 ShalokShalom joined #git
12:34 Snugglebash joined #git
12:35 Snugglebash joined #git
12:36 Panacea joined #git
12:37 _ADN_ joined #git
12:38 JeroenT joined #git
12:39 NeverDie joined #git
12:39 feodaron joined #git
12:41 tvw joined #git
12:42 pioiytr joined #git
12:42 FilipNortic_ joined #git
12:43 ploop joined #git
12:44 Gsham joined #git
12:45 DomeMaster11 joined #git
12:45 DomeMaster12 joined #git
12:47 Snugglebash joined #git
12:49 lindenle joined #git
12:51 PHPanos joined #git
12:51 troulouliou_div2 joined #git
12:53 jozwior joined #git
12:55 wiesel joined #git
12:58 gugah joined #git
13:01 Torrone joined #git
13:01 Torrone hello, I suspect that one of my branches has a symbolic reference on it, how can I verify this?
13:01 acetakwas joined #git
13:02 icey joined #git
13:02 icey joined #git
13:04 ossram joined #git
13:05 synthroid joined #git
13:06 ossram I am a a bit new to git. Come from cvs. How do I see a diff of my last 3 commits? git diff did not work.
13:06 selckin git log -p
13:07 Derperperd joined #git
13:07 ossram perfect selckin
13:08 icey joined #git
13:08 icey joined #git
13:09 icey joined #git
13:09 icey joined #git
13:09 raijin joined #git
13:11 re1 joined #git
13:12 _ikke_ git log -p -3
13:12 ossram even better!
13:12 peacememories joined #git
13:12 ossram when I do a git diff VI opens but there is nothing to compare in there? Tried with HEAD --staged etc
13:13 ossram but git log -p works
13:13 ossram any ideas? I am on FreeBSD but that should not matter.
13:14 _ikke_ ossram: Did you setup VI as pager?
13:14 ossram _ikke_, Think it is the default. Did not set  up the editor.
13:15 ossram At least not for git
13:16 * selckin wonders if hes mistaking less for vi
13:16 dviola joined #git
13:16 ossram git log -p -40 | vim - -R -c 'set foldmethod=syntax'
13:16 ossram would that do?
13:17 selckin to do what?
13:17 ossram vim though since I like to use shellcheck etc
13:17 Snugglebash joined #git
13:17 ossram Using vim as a pager for git
13:18 Snugglebash joined #git
13:19 selckin check git-config man page to set defualt pager
13:19 Snugglebash joined #git
13:20 matsaman joined #git
13:20 Bizkit joined #git
13:20 Snugglebash joined #git
13:20 cdown joined #git
13:21 Snugglebash joined #git
13:21 bruce_lee joined #git
13:21 bruce_lee joined #git
13:21 ossram Ill do that selckin. I said "FreeBSD" mean OpenBSD. Thing is they use CVS there so I am guessing nothing is set up for git.
13:21 Snugglebash joined #git
13:22 ossram got to admit git is really kick ass awesome.
13:22 Snugglebash joined #git
13:22 _ikke_ git uses less by default
13:22 _ikke_ as a pager
13:22 ossram would seem that way
13:23 dminuoso That moment when you commit something on someone elses machine and joe opens, and you have absolutely no freaking idea how to even exit the editor..
13:23 _ikke_ It's determined at compile time
13:23 Snugglebash joined #git
13:23 _ikke_ dminuoso: :D
13:23 _ikke_ dminuoso: happened to me
13:23 _ikke_ dminuoso: vim feeling all-over again :P
13:24 ossram :q! is never wrong =P
13:24 Snugglebash joined #git
13:24 _ikke_ except when you wanted to save the thing you just did
13:24 dminuoso _ikke_: Yeah indeed. :)
13:24 ossram :wq but ofc that is not self evident.
13:24 _ikke_ <esc>ZZ
13:25 Snugglebash joined #git
13:25 cyberz joined #git
13:25 qqx If you're using version control I'd almost argue that :q! is never right.
13:25 ossram VI is the anti Christ of Trolling ppl
13:25 Snugglebash joined #git
13:26 ossram big T on trolling. My boss though a coffee cut though a window a few years ago thanks to VI.
13:26 ossram cup*
13:26 rorro joined #git
13:26 inflames joined #git
13:27 cdleonard joined #git
13:28 mgedmin wow, vi inspires people to telekinesis!
13:29 jast unintentional dialog snippets #5883: "you have absolutely no freaking idea how to even exit the editor.." - "It's determined at compile time"
13:30 icey joined #git
13:30 icey joined #git
13:31 xuserxmatt joined #git
13:34 noded2222 joined #git
13:34 ThiefMaster dminuoso: echo 'EDITOR=vim' >> ~/.zshrc -- problem solved, heathen brought back onto the right path
13:35 noded2222 Hi! I'm having troubles working with visual studio and git! (github repo). Can anyone help?
13:36 noded2222 visual studio code*
13:36 jeffreylevesque joined #git
13:36 dminuoso ThiefMaster: That's assuming I can figure out how to exit the editor first!
13:36 dminuoso And if its anything like vim, it will take me years.
13:37 rawtaz left #git
13:37 noded2222 Does using github client git cause troubles?
13:37 noded2222 for vs code
13:37 _ikke_ troubles is very vague
13:39 noded2222 Hmm, gonna re-try all instructions from ground up but with git instead github desktop git. If i get stuck i'll try to describe what goes wrong exactly.
13:40 Snugglebash joined #git
13:40 msonntag joined #git
13:40 jsolano joined #git
13:40 Shashikant86 joined #git
13:40 gajus joined #git
13:41 m4sk1n joined #git
13:41 qqx joined #git
13:42 mizu_no_oto joined #git
13:43 NeverDie joined #git
13:44 brent__ joined #git
13:46 vraju left #git
13:46 BackEndCoder joined #git
13:47 robattila256 joined #git
13:47 Gsham joined #git
13:48 noded2222 Should i set up git through git bash to connect to remote github or is there a way to do it through VS code itself?
13:49 tmk joined #git
13:49 tmk left #git
13:49 noded2222 this stuff is complicated >...< i just wanna code lol.
13:49 ToBeCloud joined #git
13:52 jast I don't really know anything about VS code...
13:52 jast !gui ;)
13:52 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
13:54 noded2222 Hmm, what is a 'git CLI' ?
13:54 mgedmin Command Line Interface
13:55 noded2222 Aww...
13:56 jast I mean, it's not forbidden to ask about GUI clients here, it's just that most of us don't use them and so don't know much about them
13:56 noded2222 hmm
13:56 qqx noded2222: You could try finding a support channel for VS Code.
13:56 harry1 joined #git
13:56 jast and if you're unlucky they'll say "we don't know anything about git" ;)
13:57 jabberwock left #git
13:57 tvw joined #git
13:59 govg joined #git
13:59 mischat_ joined #git
14:00 noded2222 Hmm okay, what if i ask this ;) :
14:01 ecuanaso joined #git
14:01 noded2222 Do all git settings get saved inside the .git file? Like, do GUI edit the .git folder itself?
14:01 noded2222 that would help out
14:02 _ikke_ noded2222: some settings live in .git/config, others in a user global settings file
14:02 _ikke_ (there is also system global, but that's rarely used)
14:02 qqx Information about a remote would almost always be in .git/config
14:03 _ikke_ right
14:05 garethdaine joined #git
14:06 solenodic joined #git
14:06 noecc joined #git
14:07 jsolano_ joined #git
14:08 _Cyclone_ joined #git
14:09 Snugglebash joined #git
14:09 cyberz joined #git
14:10 jimi_ joined #git
14:12 jsolano joined #git
14:16 rainrawr joined #git
14:17 ecuanaso joined #git
14:18 Raging_Hog joined #git
14:19 mizu_no_oto joined #git
14:20 rnsanchez joined #git
14:23 borkr joined #git
14:26 metachr0n joined #git
14:26 Torrone joined #git
14:27 seni joined #git
14:28 mischat joined #git
14:29 ShekharReddy joined #git
14:29 djh joined #git
14:30 mischat joined #git
14:31 boombatower joined #git
14:32 nickabbey joined #git
14:33 Anticom joined #git
14:37 Dougie187 joined #git
14:37 Derperperd joined #git
14:37 kpease_ joined #git
14:38 dviola joined #git
14:41 Gsham joined #git
14:41 marlinc joined #git
14:43 mostlybadfly joined #git
14:44 Ryanar joined #git
14:45 mischat_ joined #git
14:46 bannakaffalatta joined #git
14:47 AaronMT joined #git
14:48 NeverDie joined #git
14:48 ash_workz joined #git
14:49 ecuanaso joined #git
14:49 ikelso joined #git
14:50 griffindy joined #git
14:50 Es0teric joined #git
14:50 dsdeiz joined #git
14:50 dsdeiz joined #git
14:51 lindenle joined #git
14:52 cdg_ joined #git
14:52 Es0teric joined #git
14:52 griffindy joined #git
14:53 Derperperd joined #git
14:54 Raging_Hog joined #git
14:54 red82 joined #git
14:57 griffindy joined #git
15:00 cyberz joined #git
15:01 Gsham joined #git
15:02 crose joined #git
15:03 mohabaks joined #git
15:04 cdown joined #git
15:04 YuGiOhJCJ joined #git
15:05 solenodic joined #git
15:06 Es0teric joined #git
15:08 menip joined #git
15:08 dsdeiz joined #git
15:13 cyberz joined #git
15:13 Shashikant86 joined #git
15:14 jagob joined #git
15:16 cdg joined #git
15:17 Es0teric joined #git
15:17 mischat joined #git
15:18 re1_ joined #git
15:19 Tobbi joined #git
15:20 thebinary joined #git
15:20 jsolano joined #git
15:21 re1 joined #git
15:22 Darren__ joined #git
15:22 Es0teric joined #git
15:22 solenodic joined #git
15:22 overlord_tm joined #git
15:23 cyberz joined #git
15:25 seni joined #git
15:28 shinnya joined #git
15:28 ecuanaso joined #git
15:28 Gsham joined #git
15:28 cyberz joined #git
15:31 al-damiri joined #git
15:33 LeBlaaanc joined #git
15:33 Es0teric joined #git
15:34 amagawdd joined #git
15:35 robattila256 joined #git
15:35 todd_dsm joined #git
15:36 lordjancso joined #git
15:36 zeroed joined #git
15:37 cdg joined #git
15:38 cyberz joined #git
15:38 annoymouse joined #git
15:40 dviola joined #git
15:41 dviola joined #git
15:41 harry1 joined #git
15:43 SteenJobs joined #git
15:43 solenodic joined #git
15:45 Raging_Hog joined #git
15:45 solenodic joined #git
15:46 ResidentBiscuit joined #git
15:49 dsdeiz joined #git
15:49 seni joined #git
15:50 denisMone joined #git
15:51 mizu_no_oto joined #git
15:53 wiesel joined #git
15:54 dreaddymck joined #git
15:55 cagmz joined #git
15:56 RxMcDonald joined #git
15:56 Ryanar joined #git
15:56 RxMcDonald git merge -s ours origin/master error: Untracked working tree file would be overwritten by merge read tree failed
15:57 RxMcDonald I need to merge with origin favoring (resolving all conflicts) from my local version
15:57 Hobbyboy joined #git
15:57 barteks2x joined #git
15:58 canton7 RxMcDonald, as the message says, an *untracked* file would be overwritten, which is why git stopped. If you are happy losing that untracked file, then delete it. Otherwise, move it somewhere safe
16:00 RxMcDonald well, no I need the file, I committed and then merged with --allow-unrelated-histories
16:01 Darren__ joined #git
16:01 ShalokShalom joined #git
16:01 RxMcDonald If my pull request on the same branch got accepted and I commit again, will this create a new pull request ?
16:01 _raynold_ joined #git
16:01 RxMcDonald i.e. github
16:01 Ryanar joined #git
16:02 RxMcDonald ?
16:03 gigq joined #git
16:03 RxMcDonald nvm it doesn't
16:03 RxMcDonald left #git
16:03 Derperperd joined #git
16:07 tcorneli joined #git
16:08 geoid__ joined #git
16:09 jantje So, GVFS, any plans for Linux?
16:09 jantje (with btrfs?)
16:09 geoid_____ joined #git
16:10 joki- joined #git
16:11 nickabbey joined #git
16:11 grawity nah, with fuse
16:11 grawity there have been third-party plans for it for a long time, except nobody settled on a protocol for fetching stuff
16:13 a_thakur joined #git
16:13 amagawdd joined #git
16:14 dviola joined #git
16:16 Tobbi joined #git
16:17 thiago joined #git
16:21 dviola joined #git
16:22 brent__ joined #git
16:24 Shashikant86 joined #git
16:25 madewokherd joined #git
16:26 hashpuppy joined #git
16:27 malt3 joined #git
16:31 mohabaks joined #git
16:32 raedah joined #git
16:35 seni joined #git
16:37 bgerber joined #git
16:37 synthroid joined #git
16:38 chardan joined #git
16:40 tyreld joined #git
16:43 mischat joined #git
16:43 mischat joined #git
16:43 e14 joined #git
16:45 prg318 is there a way to filter commit history by author email address?
16:45 prg318 ie: only show commits from a certain email domain
16:45 grawity --author=
16:45 prg318 i might be doing it wrong; but i tried git log --author="*@mydomain*" and it didn't like that :X
16:45 Gsham joined #git
16:46 BrownBear joined #git
16:46 prg318 oh i don't need the wildcards
16:46 prg318 i see
16:46 prg318 thanks grawity
16:47 grawity it's a regex, and * at the beginning of a regex doesn't make any sense
16:47 grawity so it probably just rejects the whole thing
16:50 treia joined #git
16:51 prg318 is there a git log option to provide just the filenames of things that have changed?  kinda like git diff --names-only but for git log
16:51 grawity --stat, or --name-status
16:52 prg318 i mean what if i just want a list of the files changed
16:52 prg318 that matches a given author regex
16:55 prg318 i know i can grep/awk but
16:55 PettanShoutaKun joined #git
16:57 zivester joined #git
16:57 jccn joined #git
16:58 mischat joined #git
16:58 re1 joined #git
16:59 prg318 looks like grep/awk is prob the answer here
16:59 prg318 thanks
16:59 mischat_ joined #git
17:00 theoceaniscool joined #git
17:00 rubyonrailed joined #git
17:01 Oatmeal joined #git
17:01 sargentmki joined #git
17:02 nidr0x joined #git
17:02 svm_invictvs joined #git
17:02 MrLawrence joined #git
17:02 publio joined #git
17:03 gechr joined #git
17:04 aard_ joined #git
17:04 dreaddymck joined #git
17:04 gechr joined #git
17:06 ihradek joined #git
17:07 cdg_ joined #git
17:07 rorro joined #git
17:07 Murii joined #git
17:08 PettanShouta-Kun joined #git
17:12 seni joined #git
17:13 canuk joined #git
17:14 solenodic joined #git
17:14 Noldorin joined #git
17:15 thierryp joined #git
17:17 Derperperd joined #git
17:18 chardan git question: I have commits A, B, C, ... Z, ...ZZZ where there are scores of other commits between C and Z. I want to squish ABC,Z. rebase -i HEAD~40 or something is the way I can think of, but is there another way that groups by author, for example?
17:18 chardan Thanks!
17:23 tang^ joined #git
17:24 Ryanar joined #git
17:26 armyriad joined #git
17:28 seni joined #git
17:32 solenodic joined #git
17:38 ecuanaso joined #git
17:40 jnavila_ joined #git
17:44 dviola joined #git
17:45 WayToDoor joined #git
17:46 worstadmin I have a merge conflict I keep resolving but when I try to merge in the branch again - I get the exact same conflict. Has anyone experienced this?
17:47 worstadmin I choose to keep local changes (ours) and commit - but when I merge master it tells me again there is the same set of conflicts. And this seems like what should happen if my changes are not pushed upstream (it is fast-forward only)
17:47 geoid_____ joined #git
17:48 svm_invictvs joined #git
17:49 a0x10c joined #git
17:49 courrier joined #git
17:51 awkwardusername joined #git
17:51 mostlybadfly joined #git
17:51 lindenle joined #git
17:51 dviola joined #git
17:52 _pix joined #git
17:54 PettanShoutaKun joined #git
17:55 rwp prg318, Try 'git whatchanged'. It provides a list of changed files with the log.
17:56 knittl joined #git
17:56 knittl joined #git
17:56 angseus joined #git
17:56 harv joined #git
17:56 Ruler- joined #git
17:56 brendyn joined #git
17:56 ec\ joined #git
17:56 s17 joined #git
17:56 s17 joined #git
17:56 deltab joined #git
17:56 BooK joined #git
17:56 Renter joined #git
17:56 hiroki joined #git
17:56 hiroki joined #git
17:56 jj- joined #git
17:56 TooLmaN joined #git
17:56 jdiez joined #git
17:56 jerrcs joined #git
17:56 chrisml joined #git
17:56 martinklepsch joined #git
17:56 spb joined #git
17:56 varesa joined #git
17:56 Vauff joined #git
17:56 GingerGeek joined #git
17:56 GingerGeek joined #git
17:56 MajorPayne joined #git
17:56 Dyonisos joined #git
17:56 laumann joined #git
17:56 ejnahc joined #git
17:56 dminuoso joined #git
17:56 adymitruk joined #git
17:56 puff joined #git
17:56 thoros joined #git
17:56 ollien joined #git
17:56 mattcen joined #git
17:56 grantrules joined #git
17:56 jlewis joined #git
17:56 Rhonda joined #git
17:56 loglaunc- joined #git
17:56 rcn joined #git
17:56 lus joined #git
17:56 thesquib joined #git
17:56 cymen joined #git
17:56 rawburt joined #git
17:56 sab3r joined #git
17:56 Gabemo joined #git
17:56 noctux joined #git
17:56 mattp joined #git
17:56 fuchstronaut joined #git
17:56 leonarth joined #git
17:56 Whisket joined #git
17:56 p1k joined #git
17:56 jleclanche joined #git
17:56 malide joined #git
17:56 bumpy joined #git
17:56 utrack joined #git
17:56 WebDawg joined #git
17:56 chamunks joined #git
17:57 hplar joined #git
17:57 musicmatze joined #git
17:57 artgoeshere joined #git
17:57 Ram-Z_ joined #git
17:57 AndreSomers joined #git
17:57 daishan joined #git
17:57 linduxed joined #git
17:57 anbz joined #git
17:57 fold4 joined #git
17:57 Korvin joined #git
17:57 Korvin joined #git
17:57 manuelschneid3r joined #git
17:57 varesa joined #git
17:57 Squarism joined #git
17:57 kwmiebach___ joined #git
17:57 SirCmpwn joined #git
17:57 dserodio joined #git
17:57 Mixologic joined #git
17:58 LiENUS joined #git
17:58 msonntag joined #git
17:58 idr0p joined #git
17:58 pelegreno joined #git
17:58 qsx joined #git
18:00 l2y joined #git
18:00 kireevco joined #git
18:00 CEnnis91 joined #git
18:00 annoymouse joined #git
18:01 DuncanT joined #git
18:01 nickabbey joined #git
18:01 sitaram joined #git
18:01 sitaram joined #git
18:01 hashpuppy joined #git
18:01 Pieter joined #git
18:01 varesa joined #git
18:01 Roconda joined #git
18:01 watersoul joined #git
18:01 _raynold_ joined #git
18:01 Someguy123 joined #git
18:01 dave0x6d joined #git
18:02 ec joined #git
18:02 Kobaz joined #git
18:02 Derperperd joined #git
18:02 ggherdov joined #git
18:02 pur3eval joined #git
18:03 wizonesolutions joined #git
18:03 sebhoss joined #git
18:03 inflames joined #git
18:03 angular_mike_ joined #git
18:03 cdg joined #git
18:03 hahuang65 joined #git
18:04 HardlySeen joined #git
18:04 varesa joined #git
18:04 TomyLobo joined #git
18:04 dviola joined #git
18:05 ec joined #git
18:05 duderonomy joined #git
18:05 chardan joined #git
18:06 varesa joined #git
18:06 ggherdov joined #git
18:06 bbhoss joined #git
18:06 pizzaops joined #git
18:07 huhlig joined #git
18:07 lebster joined #git
18:07 stealthii joined #git
18:09 cdg_ joined #git
18:09 bannakaffalatta joined #git
18:09 varesa joined #git
18:10 worstadmin rwp: Weirdly enough I did the merge the other direction (my_branch into master) and that worked.
18:10 worstadmin I was doing master into my_branch and then trying to throw up a PR
18:11 rwp worstadmin, Uhm... Did you confuse me with someone else?
18:12 Tobbi joined #git
18:13 ecuanaso joined #git
18:14 varesa joined #git
18:15 dsdeiz joined #git
18:15 abyx joined #git
18:19 Es0teric joined #git
18:23 joelsmith joined #git
18:23 shampine joined #git
18:23 Gsham joined #git
18:23 _ADN_ joined #git
18:26 rwp worstadmin, Looking at your last question (since you did ping me) have you rebased or merged master back into your topic branch? If not then that is why you keep getting the conflicts when merging the other direction. Re-sync your topic branch back with master to solve your conflict problem.
18:26 mizu_no_oto joined #git
18:26 DomeMaster12 joined #git
18:26 NeverDie joined #git
18:26 lamont joined #git
18:27 msafi joined #git
18:28 Deamon joined #git
18:28 Es0teric_ joined #git
18:31 ThomasLocke_ joined #git
18:31 ThomasLocke_ joined #git
18:32 matoro joined #git
18:39 meLon joined #git
18:40 joshszep joined #git
18:40 dreiss joined #git
18:41 joshszep joined #git
18:43 varesa joined #git
18:43 m0viefreak joined #git
18:44 varesa joined #git
18:44 rubyonrailed joined #git
18:49 [ADN] joined #git
18:51 PettanShoutaKun joined #git
18:52 mkoskar joined #git
18:52 [ADN] joined #git
18:53 Limes joined #git
18:53 duderonomy joined #git
18:56 _ADN_ joined #git
18:56 nickabbey joined #git
18:58 ozmage joined #git
18:58 F0sea joined #git
18:58 MineCoins joined #git
18:58 [ADN] joined #git
18:58 krillr joined #git
19:00 DomeMaster12 joined #git
19:00 dreiss joined #git
19:01 diegoaguilar joined #git
19:01 diegoaguilar Hello, is it possible to do a git patch according to a grep? For example, "stage everything where diff includes 'foo'"
19:02 bannakaffalatta joined #git
19:03 diogenese joined #git
19:06 matoro joined #git
19:06 rwp diegoaguilar, I am not aware of a builtin git way to do that. Not that I know much though. But with some creativity you could craft such result by committing to a branch and then using filter-branch to filter it.
19:06 garethdaine joined #git
19:06 diegoaguilar hmm that would be awesome ...
19:06 diegoaguilar filter-branch is ...
19:06 diegoaguilar ?
19:06 rwp man git-filter-branch
19:06 gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
19:07 diogenese joined #git
19:07 rwp I would not consider htat a simple thing to do. But if you had some massive mass change then learning how to drive it might be useful.
19:07 bocaneri joined #git
19:07 rwp Just a thought...
19:07 qqx I wouldn't think filter-branch would be used for that.
19:07 diegoaguilar right ... I agree, I dont think it's a short task though
19:08 rorro joined #git
19:08 diegoaguilar just, sometimes would be awesomely helpful
19:08 rwp If your change granularity is file level then you can craft a find&grep to identify the files to commit. Then add&commit only those.
19:08 ihradek joined #git
19:10 druonysus__ joined #git
19:10 qqx git add $(git diff --name-only -G<pattern>)
19:11 rwp As a kibitzer here, thanks qqx, I like it!
19:13 rwp Since adding unchanged files does nothing I would exploit 'git add $(find . -name .git -prune -o -exec grep PATTERN {} +)' for a different way of doing that.
19:13 rwp Since adding unchanged files does nothing I would exploit 'git add $(find . -name .git -prune -o -exec grep -l PATTERN {} +)' for a different way of doing that.
19:15 rwp I am also a huge fan of 'git add -p' but that is for manual control. Not sure how to automate it.
19:17 Sasazuka joined #git
19:19 le_melomane joined #git
19:19 netj joined #git
19:19 qqx rwp: Unlike my suggestion that would stage changes to files where the pattern was already there, but not being changed.
19:20 rebrec joined #git
19:20 minikN joined #git
19:20 rwp qqx, Only if there were other changes to those files. Normally (in my use of normal, perhaps not others) the file would be unchanged. Therefore not staged.
19:21 qqx Well, ideally there wouldn't be a need to do *any* selective staging of changes. Once you want to do that, I'd say all bets are off.
19:22 rwp I try to keep my working copy focused on one thing at a time. Of course real life practicalities sometimes work against that. In which case git add -p is really awesome.
19:23 qqx Yeah. I agree. Although I tend to use Gdiff from fugitive rather than `git add -p`.
19:24 rwp I haven't used it. You like it? You would recommend it?
19:25 qqx Yes. Definitely.
19:25 qqx I do a large portion of my git operations using that.
19:26 qqx But most of it's fairly minor wrappers around the CLI, so it's pretty easy to switch between.
19:27 rwp A good friend of mine works for a large corp using git. But he complains they have wrapped everything with so many layers that although he uses git every day he has no idea how to use git in any other environment.
19:30 wilbert joined #git
19:30 joki- joined #git
19:30 Gsham joined #git
19:31 KV joined #git
19:31 Jackneill joined #git
19:42 perlpilot joined #git
19:44 mizu_no_oto joined #git
19:45 stomplee joined #git
19:46 A124 How does one get own repo to be up to date with upstream?
19:47 moritz git pull
19:48 A124 That does say up to date.
19:48 relipse joined #git
19:49 cdg joined #git
19:50 aw1 joined #git
19:51 qqx A124: Is the origin for your local repository the upstream, or is it a fork of the upstream?
19:52 pur3eval joined #git
19:52 A124 Origin is upstream
19:53 A124 My branch now happens to be both behind and ahead, eventhough iw was merged just now to the same code I started with.
19:54 kadoban joined #git
19:55 cdg joined #git
19:55 Lunatrius joined #git
19:56 synthroid joined #git
19:56 sarp joined #git
19:57 ozmage joined #git
19:57 Derperperd joined #git
20:00 Gsham joined #git
20:00 vuoto joined #git
20:01 mquin joined #git
20:02 PettanShoutaKun joined #git
20:11 lungaro oh man, git buglet
20:12 lungaro If I do "git add repo2" and repo2 is a repo also, it gets added as a submodule or whatever. Then rm -rf repo2/.git
20:12 lungaro doing a git add repo2 again just core dumps
20:13 Seveas lungaro: yeah, well known buglet for which fixes are in progress.
20:13 lungaro I figured as much, what I was checking
20:13 Seveas the fix is "don't dump core", not "do something sensible" unfortunately.
20:13 lungaro hehe
20:13 lungaro isn't every problem pebkac?
20:13 PettanShoutaKun joined #git
20:16 _W_ joined #git
20:16 Seveas no, this is an actual bug
20:17 SteenJobs_ joined #git
20:17 wilbert joined #git
20:17 qqx Seveas: That just means that the problem was between a different keyboard and chair.
20:17 A124 So the thing it, I did submit pulls for master, and a new branch. Branch was immediately merged to master then the change I done on master.
20:17 A124 And I merged the branch to my master.
20:17 A124 Now I'm just lost.
20:17 Seveas qqx: git developers sit on thrones, not chairs :P
20:18 WayToDoor joined #git
20:18 foul_owl joined #git
20:18 olbat joined #git
20:18 foul_owl How do I see what a pull _would_ do without actually doing the pull?
20:18 Seveas foul_owl: fetch and use git merge-tree
20:19 nowhereman joined #git
20:19 Seveas https://git.seveas.net/previewing-a-merg​e-result.html#previewing-a-merge-result
20:19 foul_owl Thank you! :)
20:20 cdg joined #git
20:21 Gsham joined #git
20:21 noecc left #git
20:22 tobiasvl oh, that's nice. I usually just merge, and if that wasn't OK I just reset back to ORIG_HEAD
20:25 ThomasLocke_ joined #git
20:25 ThomasLocke_ joined #git
20:26 cdg joined #git
20:26 jccn joined #git
20:27 cdg_ joined #git
20:27 Gsham joined #git
20:28 PettanShoutaKun I made a fork of a repo. Is there a way to delete stuff out of this fork's master branch without git trying to delete it in the future if I merge it back into where I forked it from?
20:29 cdg joined #git
20:29 jetpack_joe joined #git
20:30 philipsd6 joined #git
20:30 moritz PettanShoutaKun: no
20:30 PettanShoutaKun ffffffuuuuuuuuuuuuuuuuuu
20:30 jast you can add a commit that deletes things, but it will still exist in the history
20:30 PettanShoutaKun really?
20:30 moritz unless you revert the reversal before merging
20:31 PettanShoutaKun I don't think I could
20:31 PettanShoutaKun there's a LOT of commits
20:31 PettanShoutaKun I guess we should have kept the working trees cleaner
20:31 jast in that case future merges will typically produce what's called delete/modify conflicts, meaning you'll have to confirm to git that you want that file to stay deleted
20:32 jast if you want things to be truly gone, make a local copy of the repo, run 'git filter-branch' on all of its branches and tags to get rid of the files (examples in man git-filter-branch, look for the one that uses --index-filter because it's way faster), then push that into a new repo. the new repo won't have the deleted files in its history, but merges will be even worse with this approach
20:32 gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
20:34 PettanShoutaKun why will merges be worse with that approach?
20:34 PettanShoutaKun is it because the commits with technically be the same but will actually have different changes in them?
20:36 invisbl_ joined #git
20:36 jast as far as git is concerned, the filtered version has completely different commits (all the IDs are different)
20:36 PettanShoutaKun oh nice!
20:36 PettanShoutaKun wait so why will merging be hard at that point
20:37 wrkrcoop joined #git
20:37 jast so there is no base version merge can use... all files that exist in both sides will be marked as conflicted, and the files you deleted will simply show up (don't exist in one repo, exist in other repo -> easy fix, just include them :P)
20:37 wrkrcoop i need to find out which branch i branched off of … how can i do that?
20:37 matoro joined #git
20:37 PettanShoutaKun I guess the initial idea is that we're mostly working on our own stuff in completely separated folders regardless
20:37 cdg_ joined #git
20:38 jast wrkrcoop: git doesn't store that information, you can find all branches that are part of your branch's history using: git branch --merged <your branch>
20:38 bannakaffalatta joined #git
20:38 PettanShoutaKun My plan was to make a greater "staging" repo which is pretty much one of everyone's upstream
20:38 jast you might actually get more precise information out of the reflog
20:39 qqx wrkrcoop: You can use `git reflog <branch-name>`. The last line should tell you that.
20:39 Gsham joined #git
20:40 wrkrcoop thanks both of u
20:41 cdown joined #git
20:44 Balliad joined #git
20:45 Mikerhinos joined #git
20:45 Uur joined #git
20:50 unreal_ joined #git
20:53 pur3eval joined #git
20:54 solenodic joined #git
20:55 chipotle joined #git
20:56 mrVandermare joined #git
20:59 ianmethyst joined #git
21:01 thiago joined #git
21:02 druonysus__ joined #git
21:03 zezba9000 joined #git
21:03 PioneerAxon joined #git
21:05 danimal2 joined #git
21:05 yqt joined #git
21:05 zezba9000 is there a way to pass your username/password to a git clone/push/pull command?
21:05 Rliza joined #git
21:09 red82 joined #git
21:10 Seveas yes
21:11 Seveas you can either put it in the url (not recommended) or use a credential helper (recommended)
21:12 Tobbi joined #git
21:14 moritz or use SSH URLs and SSH keys (even more recommended)
21:16 PioneerAxon joined #git
21:17 gvea joined #git
21:18 askb joined #git
21:22 overlord_tm joined #git
21:23 Atm0spher1c joined #git
21:23 zezba9000 I don't see anything in the helper for a password, only username
21:24 zezba9000 Seveas: https://git-scm.com/docs/gitcredentials
21:24 zezba9000 I don't want it to ask for a password as I'm invoking git from C#
21:24 zezba9000 so I just want to provide the password in a single git call
21:25 Seveas zezba9000: enable a helper, it'll ask for a password once and then store it. Or you can pre-generate e.g. the file used by the store helper.
21:25 ojacobson We have our login tool (`our-cli login`) write tokens for git access into ~/.netrc, for example
21:25 ojacobson (We really ought to update it to use a cred helper)
21:25 Seveas But in your case I'd look at the c# bindings for libgit instead of using system("git push")
21:26 zezba9000 I'm using libgit2 now but it doesn't auto support git-lfs and its unstage method is broken right now
21:27 zezba9000 I'm making a C# tool called GitCommander to just interface with the main git stuff in C#
21:28 jsolano_ joined #git
21:29 zezba9000 also the format "git clone https://username:password@github.com/username/repository.git" still asks me for a password
21:31 zezba9000 I also can't use "git config credential.helper store" without being in a repo... thus clone wont work...
21:31 gajus joined #git
21:31 varesa joined #git
21:31 zezba9000 ....this is a fragmented mess :(
21:32 Eugene `git config --global` will set it in your user's ~/.gitconfig file. `git config` sets it in the local repo; if a repo doens't exist then wtf
21:32 alburaq joined #git
21:32 ojacobson Or, probably wiser, pass tool-specific config to git using `-c` arguments
21:32 alburaq what does "fresh new dataset" upon git commit mean?
21:32 ojacobson `git -c credential.helper=foo clone …`
21:33 Eugene Even better advice ^
21:33 ojacobson alburaq: context?
21:33 Tobbi joined #git
21:33 alburaq "[master 223sadf] fresh new dataset", said git upon git commit
21:33 ojacobson That's the first line of the commit message
21:33 ojacobson you'd have to ask whoever wrote the commit message
21:33 alburaq 223sadf is some number in hex
21:33 alburaq oh i just wrote that...
21:33 ojacobson [master 223sadf] is the branch name and an abbreviated hash for the commit
21:34 zezba9000 "git config --global credential.helper store" doesn't ask for a username/pass?
21:34 alburaq ojacobson: thank you
21:35 EY joined #git
21:37 gigq joined #git
21:37 jsolano joined #git
21:38 solenodic joined #git
21:38 DomeMaster12 joined #git
21:40 zezba9000 there is really no way to just clone a repo without storing your user/pass?
21:40 cbreak zezba9000: nah, it's easay
21:40 cbreak git clone ssh://git@server/repo.git
21:40 philipsd6 left #git
21:41 zezba9000 cbreak: that doesn't take in user/pass
21:41 cbreak it doesn't need passwords
21:41 zezba9000 and I'm testing with http
21:41 cbreak passwords are garbage.
21:41 cbreak ssh does proper authentication with public / private keys
21:41 zezba9000 don't need it and libgit2 doesn't either
21:42 zezba9000 how is libgit2 sending the user/pass without storing it
21:42 zezba9000 if libgit2 can do it, so should git
21:42 cbreak git doesn't need to store anything
21:42 fatalhalt joined #git
21:42 zezba9000 ok so my PC does?
21:43 zezba9000 what if I want to invoke a git clone without storing user/pass anywhere but in my code
21:43 PettanShoutaKun joined #git
21:43 cbreak type the following: git clone someurl
21:43 cbreak then give git the password via stdin
21:45 borkr joined #git
21:46 wilbert joined #git
21:46 acetakwas joined #git
21:46 zezba9000 cbreak: So this format is the best for that correct: git clone https://username@github.com/username/repository.git
21:47 zezba9000 then it will ask for password I can send via stdin
21:48 cbreak zezba9000: if you want to use https
21:48 zezba9000 that doesn't work either... it pops open the user/pass dlg
21:48 tvw joined #git
21:48 cbreak and your repo is stored in a directory that is the same as that user name
21:48 cbreak zezba9000: you've configured git to use a GUI then
21:49 zezba9000 so no way to force git to not use the gui?
21:49 cbreak configure it that way
21:50 zezba9000 ugg, but I don't want that. I need it to work with the default windows installer setup
21:50 cbreak zezba9000: you don't have to permanently configure it
21:51 cbreak git -c foo=bar clone ...
21:51 hobodave joined #git
21:51 zezba9000 what is git -c foo=bar? Docs for this?
21:51 zezba9000 can't find them
21:52 sepsun joined #git
21:52 Seveas man git should show it
21:52 gitinfo the git manpage is available at http://jk.gs/git.html
21:52 Seveas -c foo=bar means 'pretend foo=bar appears in the config'
21:52 cbreak zezba9000: man git has that
21:52 gitinfo zezba9000: the git manpage is available at http://jk.gs/git.html
21:53 mizu_no_oto joined #git
21:53 cbreak zezba9000: also man git-config
21:53 gitinfo zezba9000: the git-config manpage is available at http://jk.gs/git-config.html
21:53 cbreak you probably want credential.helper
21:54 varesa joined #git
21:54 YuGiOhJCJ joined #git
21:54 cbreak also core.askPass
21:55 Phenix joined #git
21:55 PettanShoutaKun joined #git
21:55 hvxgr joined #git
21:57 rmbeer joined #git
21:57 rmbeer hello
21:58 kyan joined #git
21:59 rmbeer i use 'git clone --bare' for get a project.git , and use it for clone, push and pull any commits. but how to use the project.git for push and pull in other projects?
21:59 denisMone joined #git
21:59 matoro joined #git
22:00 rmbeer i read the project.git is the same of .git/ directory of any clone repo. also work in project.git?
22:00 mischat joined #git
22:01 rmbeer well, view that no...
22:02 rmbeer i can't push all commits from project.git to project2.git?
22:05 theoceaniscool joined #git
22:07 m4sk1n joined #git
22:07 zezba9000 cbreak: The docs do not describe how to invoke: "git -c" in combination with git-credential-cache
22:08 zezba9000 I don't see any info about how to use "Low-level commands" with git... I just see that they exist
22:10 zezba9000 "git config --global credential.helper cache" fails
22:11 zezba9000 I want to override the user/pass in memory.. but how to do this globaly
22:14 Dougie187 left #git
22:14 zezba9000 passing "git -c credential.helper=git-credential-cache clone myURL.git" doesn't ask for user/pass
22:14 PettanShoutaKun joined #git
22:15 DomeMaster12 joined #git
22:15 zezba9000 git -c credential.helper=cache reports an error of "git: 'credential-git-credential-cache' "
22:17 zezba9000 git -c foo.bar= means very little to me... this is void of context
22:18 vsl joined #git
22:18 ojacobson So, a quick primer on credentials helpers: they're standalone programs (named git-credential-*) whose primary job is to take information about a remote request as input (args, stdin) and to provide credentials for that request on stdout
22:18 ojacobson Git picks credential helpers by looking at any of a number of env vars and config keys
22:19 pur3eval joined #git
22:19 ojacobson What that helper does is entirely up to the author of the helper - git comes with some that do cred caching, but you can provide your own that does anything it wants
22:19 ojacobson git-config and git's -c arguments set config keys _for git_ - credential.helper is the name of the key configuring the default credential helper
22:20 ojacobson Setting credential.helper to "cache" will cause git requests that need creds to run git-credential-cache
22:20 sitaram joined #git
22:20 ojacobson In recent versions of git, `git credential` (man git-credential) provides a scriptable interface to populating and querying the included credential helpers
22:20 gitinfo the git-credential manpage is available at http://jk.gs/git-credential.html
22:21 zezba9000 but no docs on how to make a custom app for this?
22:22 ojacobson git's cred tools are exceptionally careful to avoid putting creds in either the command-line args, or in the environment, by design - both of those things are visible to any user on the machine, under most circumstances
22:22 ojacobson zezba9000: man gitcredentials
22:22 gitinfo zezba9000: the gitcredentials manpage is available at http://jk.gs/gitcredentials.html
22:22 SwiftMatt joined #git
22:23 ojacobson jast: btw, the link to 'credentials API' on that man page goes to the wrong host
22:24 ojacobson Should (probably) be https://www.kernel.org/pub/software/scm/​git/docs/technical/api-credentials.html - not sure if that's a defect in your man page mirroring or in the original man page
22:24 pur3eval joined #git
22:25 DomeMaster12 joined #git
22:25 ikelso joined #git
22:28 Derperperd joined #git
22:28 shgysk8zer0_ joined #git
22:29 jagob joined #git
22:29 garethdaine joined #git
22:31 cbreak zezba9000: it's just a git config override
22:31 cbreak read the man page for details
22:32 Zju joined #git
22:34 canuk joined #git
22:35 deepa joined #git
22:35 stfn joined #git
22:35 zezba9000 cbreak: that doesn't mean anything to me. foo.bar is ambiguous.
22:35 cbreak so?
22:36 ojacobson The meanings of individual keys are documented (for the most part) in man git-config
22:36 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
22:36 zezba9000 so I do not understand how to run the git commands or what to pass them
22:36 ojacobson To be 100% clear: there is, by design, no way to provide a password to a git operation as a command-line argument, except as part of the url.
22:36 zezba9000 yes I see the commands.. how to format them in the combination I need doesn't make sense
22:36 ojacobson Putting passwords in argv is hilariously insecure.
22:36 rmbeer hello
22:37 cbreak zezba9000: why not?
22:37 cbreak just set the config as you want with it
22:37 cbreak zezba9000: are you unable to read the man page for git?
22:37 cbreak it explains how to use -c
22:37 zezba9000 ojacobson: but I can as stdin
22:37 rmbeer i not understand, how to pass from project.git to project2.git? with clone, pull from one and push for other?
22:37 thierryp joined #git
22:37 zezba9000 cbreak: I'm not seeing the docs you're looking at
22:39 zezba9000 cbreak: it would be git config --global ??
22:40 zezba9000 as in what option do I use to set the custom config
22:42 zezba9000 looking at git config --file config-file
22:42 njbair joined #git
22:42 zezba9000 but does "--file config-file" mean "--file <config-file>"?
22:42 xaviergmail_ joined #git
22:42 AWITFC joined #git
22:42 PettanShoutaKun joined #git
22:43 inflames joined #git
22:45 zezba9000 git config --file "pathTo\.gitconfig" doesn't work
22:46 cdg joined #git
22:47 umpc joined #git
22:49 cbreak zezba9000: why do you keep blabbering on and on about git config?
22:49 cbreak I told you to use git -c
22:49 cbreak zezba9000: man git
22:49 gitinfo zezba9000: the git manpage is available at http://jk.gs/git.html
22:49 cbreak read it
22:49 cbreak zezba9000: man git-config, look for the option you want to set
22:49 gitinfo zezba9000: the git-config manpage is available at http://jk.gs/git-config.html
22:50 cbreak maybe you can find one that unsets the option you don't want
22:52 ZenWalker joined #git
22:52 ZenWalker hi
22:53 ZenWalker what is the opposite of git reset --hard HEAD~1 ? one commit before, I mean
22:53 zezba9000 cbreak: "git -c foo.bar=" means nothing. Its non descriptive to what arg is wants. There is no information on the page to describe valid use. It simply states objects avaliable to use... not how to use them.
22:54 zezba9000 I get crap about normal --file args mixed in with git -c args... I don't know what goes with what
22:54 zezba9000 its all blobbed in one file rather then catagorized in sections based on relevence
22:55 canuk joined #git
22:55 zezba9000 again git -c foo.bar= is NOT clean
22:56 cdg_ joined #git
22:57 zezba9000 git -c git-credential-cache=<WHAT goes here?>
22:57 menip joined #git
22:58 zezba9000 If I look at the docs for https://jk.gs/git-credential-cache.html
22:58 zezba9000 it says NOTHING about how to use it with git -c
22:58 narendraj9 joined #git
22:59 cr34ton joined #git
22:59 guyz joined #git
23:00 Tobbi joined #git
23:01 fmeerkoetter joined #git
23:01 zezba9000 cbreak: my issue is all about api formatting. The formatting is not documented for "git -c" calls.
23:03 solenodic joined #git
23:07 gusggg joined #git
23:08 guest___ joined #git
23:09 ShalokShalom_ joined #git
23:09 DomeMaster12 joined #git
23:10 gusggg I am having trouble understanding how to set up my .gitignore, and why it's giving seemingly inconsistent behavior : http://pastebin.com/raw/6MDJhTZi
23:13 cbreak sure is
23:13 cbreak just read the docs
23:14 gusggg cbreak: are you responding to me?
23:14 Vasistha joined #git
23:14 cbreak no
23:14 gusggg cbreak: would you, then :-p ?
23:14 cbreak putting a git repo into / is bad
23:15 cbreak but other than that, what's the issue?
23:15 gusggg cbreak: okay, why is it bad?
23:15 cbreak because then everything is in a git repo
23:15 cbreak git repos should be one per project
23:16 Vasistha I am working on a pre-commit hook. Right now I am running: 'git diff --name-only HEAD' to find out what files have changed. However what I really want is only a list of files that are staged for commit; I want to exclude the files that are not staged. (The same file may appear in both lists-- I do want it in that case).
23:16 DomeMaster12 joined #git
23:16 gusggg cbreak: I am using git to manage the configuration files of the OS on a robot
23:16 cbreak then put those config files into a subdir
23:16 cbreak not into /
23:16 daynaskully joined #git
23:16 gusggg cbreak: I want it to manage /etc and /unionfs/overlay/etc
23:16 cbreak then symlink them into the repo
23:17 cbreak Vasistha: git status?
23:17 cbreak Vasistha: for machine, probably git ls-files
23:17 cbreak it has flags to only show staged files
23:17 Vasistha cbreak: thank you!
23:18 matoro joined #git
23:18 gusggg cbreak: I don't see what for. Anyway, my issue is something else. I pasted my .gitignore into the link, and showed the output of the check-ignore command, giving a different answer for two cases that should behave the same (/etc and /unionfs)
23:21 Vasistha cbreak: fyi, git status --short is pretty good .. thanks!
23:22 cdg joined #git
23:26 cdg_ joined #git
23:26 rmbeer left #git
23:28 Aleric OMG... I released a new version of libcwd on 22 September 2016 and only NOW found out that I never committed the major changes of that version, let alone push it to github lol.
23:29 Aleric Fortunately the released tar ball was correct... but ppl trying to use git would have gotten old crap :/
23:29 solenodic joined #git
23:30 ZenWalker left #git
23:30 NwS joined #git
23:30 harry1 joined #git
23:31 netj joined #git
23:34 swivel joined #git
23:35 rainervonvielen joined #git
23:35 cbreak Vasistha: it's not meant to be machine parseable
23:35 cbreak Vasistha: if you want that, use ls-files as I said above
23:35 swivel quick question: is `git add --patch $newfile` supposed to work and just broken in my version of git (2.1.4)?
23:36 swivel it just says "No changes."
23:36 cbreak swivel: so, why do you think it's broken?
23:36 cbreak swivel: does git diff -- file show something?
23:36 swivel cbreak: because what I'd like to do is add it piecemeal
23:36 swivel it's a new file but contains more stuff than I want in this commit
23:36 Vasistha cbreak: I can't get ls-files to output what I want, I tried -m and -s and it doesn't do what I want. git status with a --short flag seems quite machine readable, although not with bash due to leading spaces
23:37 SwiftMatt joined #git
23:37 cbreak swivel: then do git add --intent-to-add
23:37 cbreak after that, git add -p will work
23:37 cbreak but you'll manually create hunks
23:37 nivag joined #git
23:38 btree joined #git
23:38 cbreak Vasistha: -c is what you want
23:38 swivel cbreak: thanks, I wonder if that should automagically happen when `git add --patch $newfile` happens?
23:38 cbreak it'll show all staged files (those that will be in the next commit)
23:38 cbreak no idea
23:38 swivel I expected it to treat the entire file as a +++ diff since it's a diff against nil
23:38 swivel then I could just go delete the + lines I didn't want
23:38 cbreak if you use --intent-to-add, yes
23:39 muldover01 joined #git
23:39 Vasistha cbreak: but that shows all the files in the repo, I only want to see changes. git status -s seems perfect
23:39 swivel alright, cheers
23:39 swivel left #git
23:39 cbreak Vasistha: then do a git diff
23:39 cbreak Vasistha: it has forms that are machine parseable
23:41 nivag I thought the Current stable version was 2.11.1   :-)
23:41 Vasistha eh ... I'm gonna do the thing that is giving the right output, rather than the thing that is giving the wrong output
23:43 BackEndCoder joined #git
23:46 Oatmeal joined #git
23:49 solenodic joined #git
23:51 lungaro can I do a git log between 2 time periods easily, like days 1 thru 14 of a given month?
23:54 solenodic joined #git

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