Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-24

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

All times shown according to UTC.

Time Nick Message
00:07 Some_Person left #git
00:08 svm_invictvs joined #git
00:18 SmashingX joined #git
00:21 Teny joined #git
00:22 alexandre9099 joined #git
00:23 justanotheruser joined #git
00:24 learning joined #git
00:27 theRealGent joined #git
00:27 peacememories joined #git
00:28 theRealGent Hi. I was wondering - if I'm interactively rebasing a bunch of commits to fix whitespacing and syntactic issues to appease my linter, and one of the subsequent patches after a `rebase --continue` fails, do I have to do a `commit --amend` after fixing the conflicts? Or at this point, I just do a regular commit?
00:30 theRealGent Or do I resolve the conflict, and make all my syntactic/whitespace changes as well and just do a rebase --continue?
00:32 cyberz joined #git
00:34 rominronin joined #git
00:34 cagomez joined #git
00:37 livingstn joined #git
00:37 ReptilianBrain joined #git
00:37 matoro joined #git
00:37 maroloccio joined #git
00:39 theiostream joined #git
00:39 maroloccio hi. how would you output the first commit of branch B whose diff introduced the word foobar anywhere in the repo? first == oldest
00:42 raspado joined #git
00:46 khinashefrei joined #git
00:46 Vgr joined #git
00:47 fragMental joined #git
00:51 livingstn joined #git
00:53 arescorpio joined #git
00:53 revoltingPeasant joined #git
00:56 revoltingPeasant I used git-svn with the --stdlayout flag to clone and svn repository, nothing happens when I do `git fetch` but I know that the local repo is out of date, there is a reference to the latest revision in .git/svn/.metadata but I can't fetch it for some reason.
00:58 bremner did you mean git svn fetch?
00:58 d5sx43 joined #git
00:58 revoltingPeasant bremner: yes, sorry
00:59 revoltingPeasant the command just returns with no output
00:59 Sasazuka joined #git
00:59 bremner what if you do "git svn rebase"
00:59 atomi_ joined #git
01:00 Cabanossi joined #git
01:00 revoltingPeasant "current branch foo is up to date"
01:01 revoltingPeasant here is the output of `git svn info` https://ptpb.pw/0BEv
01:02 revoltingPeasant and here is a copy of .git/svn/.metadata https://ptpb.pw/aseF
01:02 revoltingPeasant as you can see, I'm a few revisions behind the revision number in the .metadata file
01:03 ahrs joined #git
01:03 bremner weird. I'm cloning but that might take a bit for 6k revs
01:03 revoltingPeasant yeah, takes ages
01:03 porsche944 joined #git
01:04 Celelibi joined #git
01:07 revoltingPeasant it seems the user in this post https://stackoverflow.com/questions/562539/git-svn-fetch-nothing-occasionally has a similar problem.
01:08 mda1 joined #git
01:09 revoltingPeasant the .git/remotes/ folder that the first answer mentions is missing from my repo
01:16 hypokrit joined #git
01:16 madewokherd joined #git
01:17 bremner is that maybe .git/refs/remotes ?
01:22 livingstn joined #git
01:23 cyberz joined #git
01:23 jameser joined #git
01:26 thiago_ joined #git
01:29 roelmonnens joined #git
01:30 dsdeiz joined #git
01:30 dsdeiz joined #git
01:31 eclecticjohny joined #git
01:31 livingstn joined #git
01:33 Random832 joined #git
01:35 revoltingPeasant yes, it's there
01:37 bremner revoltingPeasant: dunno, I get r6775 on a fresh clone
01:38 qpdb joined #git
01:40 revoltingPeasant that's wierd if you go to https://svn.thedarkmod.com/publicsvn/darkmod_src/trunk/ it states it's at 6779, the same number that's in .git/svn/.metadata
01:41 revoltingPeasant thanks for trying that btw
01:42 bremner yeah, no worries. Sorry it didn't help. I guess you could try an svn checkout
01:43 anuxivm left #git
01:43 revoltingPeasant yeah, I suppose that's the best plan
01:44 revoltingPeasant here we go agian
01:44 planigan joined #git
01:45 Cabanossi joined #git
01:50 cyberz joined #git
01:55 durham_ joined #git
02:01 planigan joined #git
02:02 zezba joined #git
02:02 rchavik joined #git
02:03 planigan joined #git
02:04 Kallis joined #git
02:05 Kallis joined #git
02:05 rominronin joined #git
02:06 marianina8 joined #git
02:08 snowalpaca joined #git
02:09 tchan joined #git
02:11 juvenal joined #git
02:15 finalbeta1 joined #git
02:15 Cabanossi joined #git
02:16 dreiss joined #git
02:18 d^sh joined #git
02:20 durham joined #git
02:21 durham joined #git
02:22 Kobazz left #git
02:22 marianina8 joined #git
02:22 Gsham joined #git
02:23 revoltingPeasant the svn checkout gave me 6779
02:24 sbasso joined #git
02:25 roelmonnens joined #git
02:25 learning joined #git
02:34 la-mogette joined #git
02:35 NightMonkey joined #git
02:36 mostlybadfly joined #git
02:38 mizu_no_oto joined #git
02:39 sunri5e joined #git
02:40 khinashefrei joined #git
02:42 fstd_ joined #git
02:46 dsdeiz joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.1 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:49 POQDavid joined #git
02:49 om_henners joined #git
02:50 willingc joined #git
02:51 LeBlaaanc joined #git
02:52 hagabaka joined #git
02:54 rchavik joined #git
02:54 dsdeiz_ joined #git
02:55 rancyd joined #git
02:58 IRCFrEAK joined #git
02:58 pks joined #git
03:00 Cabanossi joined #git
03:01 jnewt joined #git
03:03 Pseudocrat joined #git
03:05 theiostream joined #git
03:06 ojdo joined #git
03:06 la-mogette joined #git
03:06 IRCFrEAK joined #git
03:11 glebihan_ joined #git
03:12 Goplat joined #git
03:12 Vortex34 joined #git
03:13 durham joined #git
03:13 justan0theruser joined #git
03:13 theiostream joined #git
03:14 lagothri1 joined #git
03:15 chachasmooth joined #git
03:16 IRCFrEAK joined #git
03:18 jon-mac joined #git
03:19 kaosine joined #git
03:19 Davey joined #git
03:19 Davey joined #git
03:19 hashtagstrashtag joined #git
03:19 artgoeshere joined #git
03:20 roelmonnens joined #git
03:22 osxi joined #git
03:22 IRCFrEAK left #git
03:24 raspado joined #git
03:26 kasual joined #git
03:27 fakenerd joined #git
03:28 hwrdprkns joined #git
03:28 IRCFrEAK joined #git
03:28 IRCFrEAK left #git
03:33 SwiftMatt joined #git
03:36 Allonphone joined #git
03:37 chigang joined #git
03:37 Andrew_K joined #git
03:37 rominronin joined #git
03:38 IRCFrEAK joined #git
03:38 bwn joined #git
03:41 IRCFrEAK left #git
03:41 jrm joined #git
03:41 DarkPsydeLord joined #git
03:43 hexagoxel joined #git
03:44 Guest58007 joined #git
03:44 lb1c joined #git
03:45 Cabanossi joined #git
03:53 wcpan joined #git
03:54 bocaneri joined #git
03:54 ShapeShifter499 joined #git
03:55 IRCFrEAK joined #git
03:56 bocaneri joined #git
03:56 cyberz joined #git
03:57 Celelibi joined #git
03:57 aw1 joined #git
03:58 livingstn joined #git
04:00 marianina8 joined #git
04:00 IRCFrEAK left #git
04:01 eclecticjohny joined #git
04:05 IRCFrEAK joined #git
04:05 IRCFrEAK left #git
04:05 IRCFrEAK joined #git
04:05 IRCFrEAK left #git
04:14 a_thakur joined #git
04:15 a_thakur joined #git
04:17 thiago joined #git
04:19 marianina8 joined #git
04:20 blackwind_123 joined #git
04:22 lucido-cl joined #git
04:22 NightMonkey joined #git
04:22 theiostream joined #git
04:23 IRCFrEAK joined #git
04:26 learning joined #git
04:26 la-mogette joined #git
04:30 IRCFrEAK left #git
04:33 wagle joined #git
04:37 marianina8 joined #git
04:39 diogenese joined #git
04:44 Cabanossi joined #git
04:47 hexagoxel joined #git
04:50 menip joined #git
04:54 ayogi joined #git
04:56 fakenerd joined #git
04:57 mehola joined #git
05:01 unbalancedparen joined #git
05:02 a3Dman joined #git
05:03 a_thakur joined #git
05:08 madduck joined #git
05:09 rominronin joined #git
05:09 hahuang61 joined #git
05:12 unbalancedparen joined #git
05:13 hexagoxel joined #git
05:15 IRCFrEAK joined #git
05:15 MineCoins joined #git
05:20 Vaelatern joined #git
05:27 ribasushi joined #git
05:28 miczac joined #git
05:31 bket joined #git
05:38 HalfEatenPie joined #git
05:38 luke_nukem joined #git
05:39 ribasushi joined #git
05:39 matriness left #git
05:41 a_thakur joined #git
05:43 Cabanossi joined #git
05:47 learning joined #git
05:52 rscata joined #git
05:59 Skyfinn joined #git
06:01 hypokrit joined #git
06:06 Brski joined #git
06:10 dec0n joined #git
06:16 pks joined #git
06:16 aw1 joined #git
06:18 zezba_ joined #git
06:18 SilverBe joined #git
06:20 govg joined #git
06:22 dec0n joined #git
06:22 sbulage joined #git
06:24 zezba joined #git
06:24 ogny joined #git
06:24 ogny joined #git
06:26 hypokrit joined #git
06:29 Cabanossi joined #git
06:33 kexmex joined #git
06:34 hexagoxel joined #git
06:34 luke_nukem joined #git
06:37 ahrs joined #git
06:39 cyberz joined #git
06:40 rominronin joined #git
06:44 ThomasLocke joined #git
06:44 ThomasLocke joined #git
06:46 qt-x joined #git
06:46 ThomasLocke_ joined #git
06:46 ThomasLocke_ joined #git
06:47 mda1 joined #git
06:49 lordjancso joined #git
06:51 Stutters joined #git
06:56 hahuang61 joined #git
06:56 LeBlaaanc joined #git
06:57 glebihan joined #git
06:57 Raging_Hog joined #git
07:00 Silmarilion joined #git
07:01 ozmage joined #git
07:06 elect__ joined #git
07:06 aw1 joined #git
07:11 dminuoso So I just realized that you can rebase to tags..
07:11 dminuoso This is neat! :-)
07:12 dminuoso Would you folks do this at all, or rather rebase against a dev/trunk branch instead?
07:16 zezba left #git
07:17 roelmonnens joined #git
07:17 _ikke_ branches / tags are just pointers to commits
07:17 dminuoso _ikke_: Yeah. Though as I have figured out git is not particularly happy all the time when you start treating branches like refs. :S
07:17 roelmonnens joined #git
07:17 dminuoso Well in some cases anyway.
07:17 ozmage_ joined #git
07:18 _ikke_ branches *are* refs
07:18 _ikke_ But when you check out anything that is not a branch, then you get a detached HEAD
07:18 chele joined #git
07:26 Neeeeeeeeeeks joined #git
07:27 LeBlaaanc joined #git
07:28 zeroed joined #git
07:28 zeroed joined #git
07:28 aidalgol joined #git
07:28 go1111111 joined #git
07:29 nidr0x joined #git
07:29 fakenerd_ joined #git
07:31 Neeeeeeeeeeks left #git
07:31 fakener__ joined #git
07:37 jnavila joined #git
07:37 Silmarilion Did Git support symlinks from the beginning or was it introduced in later versions? I'm having some issues with an old server so trying to investigate was it git's fault or not
07:40 roentgen joined #git
07:40 roentgen joined #git
07:43 mikecmpbll joined #git
07:44 xaa joined #git
07:46 peeps[lappy] joined #git
07:46 zeroed joined #git
07:46 n1ce joined #git
07:47 a_thakur joined #git
07:47 hexagoxel joined #git
07:48 freimatz joined #git
07:49 MarginHu joined #git
07:53 overlord_tm joined #git
07:54 eroux joined #git
07:54 _ikke_ basically since forever
07:56 SuperLag joined #git
07:58 sostenuto joined #git
07:58 nowhere_man joined #git
07:59 Cabanossi joined #git
07:59 Silmarilion _ikke_: yup
08:00 rominronin joined #git
08:01 theoceaniscool joined #git
08:01 masuberu joined #git
08:02 hurricanehrndz joined #git
08:03 Tobbi joined #git
08:03 ankit01ojha joined #git
08:05 sostenuto joined #git
08:07 math-alpha joined #git
08:18 jozwior joined #git
08:18 TomyWork joined #git
08:18 a_thakur joined #git
08:19 Eryn_1983_FL joined #git
08:20 govg joined #git
08:23 Pulp joined #git
08:23 choice joined #git
08:29 cbreak Silmarilion: servers shouldn't matter anyway
08:29 cbreak Silmarilion: they don't materialize trees in the filesystem
08:32 choice The ones here that only use the command line, what kind of git workflow do you guys have?
08:33 austin987 git diff --quiet is reporting 1 inside of a wrapper script, but 0 in a interactive bash session. A simple shell script just calling git isn't affected. I thought it may have been due to pager, but --quiet should eliminate that..anyone have any ideas/seem similar? To be clear, there is currently no diff in the repo, but script reports it is, but doesn't in plain session
08:33 _ikke_ choice: I use git cli + tig
08:33 _ikke_ choice: what kind of workflow are you refering too?
08:34 choice _ikke_: For example, do you use git to push from dev to prod?
08:34 _ikke_ No, I don't deploy directly with git
08:35 choice Why not?
08:35 _ikke_ error prone, not atomical, not suited on its own
08:35 _ikke_ And we use configuration management
08:36 choice Error prone?
08:37 mda1 joined #git
08:38 n1ce_ joined #git
08:39 _ikke_ You need to make sure removed files from the repo are also removed from the deploy directory
08:39 e joined #git
08:39 choice With "the repo" you mean on dev? and "the deploy directory" prod?
08:39 thierryp joined #git
08:40 a_thakur joined #git
08:40 choice Why would git not remove what has been deleted?
08:40 _ikke_ well, dev and prod are both deployment targets, right?
08:41 choice You could say so I guess.
08:41 _ikke_ the only thing I use git for during deployment is to get a tarball of the files, and the version. For the rest, git does not play any role
08:42 schleppel joined #git
08:42 choice Can you deploy via git without having the whole frikkin history on the production server?
08:43 Balliad joined #git
08:44 _ikke_ choice: git archive HEAD --prefix=<releasename>/ | ssh 'tar xf - -C /path/to/release/dir
08:44 _ikke_ '
08:44 choice I would assume that is pretty inefficient.
08:45 choice Isn't it sending *everything*?
08:45 ThomasLocke joined #git
08:45 choice Not only the files that differ between dev and prod?
08:46 choice Guess rsync is the better choice then.
08:47 roelmonn_ joined #git
08:49 _ikke_ choice: I don't know how big your project is, but to me it's negligable
08:50 _ikke_ choice: What if rsync gets interrupted?
08:50 _ikke_ is your project then in a half-deployed state?
08:50 choice What if tar gets interrupted?
08:50 _ikke_ Then I don't switch targets
08:50 _ikke_ (I use symlinks from the www root to the release)
08:51 choice Ok
08:51 choice But I never had that problem. That rsync got interrupted.
08:51 _ikke_ until you do
08:51 dvaske joined #git
08:51 kurkale6ka joined #git
08:52 choice Maybe somebody should write a version control system based on rsync.
08:52 _ikke_ what if someone makes a request half-way through the sync
08:52 choice Good point.
08:53 _ikke_ choice: we used a backup system that used rsync and hardlinks
08:53 _ikke_ trying to remember its name
08:53 miczac joined #git
08:53 selckin i know some ppl that used ftp to deploy to their live php site, what is the first step on copy? truncate the existing file, so they'd see a bunch of errors because it was reading empty files
08:54 choice I dabbled with rsyncs --backup option in the past which lets you create some history magic.
08:54 choice But I found rsync-backup to be the nicer way to go.
08:54 choice Maybe somebody should write a vcs based on rsync-backup
08:55 choice rdiff-backup i mean.
08:55 overlord_tm joined #git
08:55 choice Imho Git has too many quirks.
08:55 _ikke_ You can do something like rsync + releasedir + hardlinks
08:57 choice _ikke_: To use it as a vcs, you would have to add commits and comments and functions like that.
08:57 hahuang61 joined #git
08:57 _ikke_ I'm not suggesting to use that as a vcs
08:57 _ikke_ It needs a lot more to be a proper vcs
08:57 _ikke_ That was just a way to not have to sync every file all the time, but still have atomic deployments
08:58 ramsub07 joined #git
09:00 _ikke_ (choice is gone). But what I would do is then rsync to a staging dir, copy with hardlinks to a release dir, atomically switch to this release dir
09:06 MarginHu left #git
09:08 masuberu joined #git
09:10 inovas joined #git
09:11 dersand joined #git
09:11 mikecmpbll joined #git
09:14 inflames joined #git
09:16 roelmonnens joined #git
09:16 marcogmonteiro joined #git
09:17 fragMental joined #git
09:21 mrkake joined #git
09:21 mastro joined #git
09:24 SlashLife^m joined #git
09:24 SlashLife^m joined #git
09:25 SlashLife^m Morning :)
09:25 hexagoxel joined #git
09:26 kexmex joined #git
09:26 _ikke_ hai
09:26 osse herro kitty
09:26 shncgo joined #git
09:28 SlashLife^m I'm building a subcommand that runs some tests and commits the test results to the repo. We may want to use this on several repositories each with their own set of tests, and I'm now pondering the best way to implement this. Hard coding it into the subcommand seems like a bad idea, as that would not be reusable ... my current favorite is to predefine a "make" rule that each repo can customize to run the repo specific procedures.
09:29 SlashLife^m Basically I'm looking for opinions for possible alternatives ... and probably (if I go ahead with the make rule) a way to find the local copies root directory (so the correct Makefile is used even in case the subcommand is run from a subdirectory)
09:30 Rhonda When I usually pull from upstream and want to push to a different remote, like my own github clone, how do I set that up?
09:31 Rhonda Like, by default and not have to think about mentioning the remotes on pull and push all the time. :)
09:31 afuentes joined #git
09:32 SlashLife^m Rhonda: I think you can define them separately in your .git/config; not entirely sure about that, though.
09:32 cdown joined #git
09:32 SlashLife^m (You should likely use "git config" rather than modifying it manually, but I'd have to check how myself. :))
09:32 Rhonda SlashLife^m: Yep, I think that's doable, but I am at loss with keywords for googling it right now.  xD
09:36 SlashLife^m Rhonda: I skimmed over "man git-config"; seems there is a pushRemote option for branches that overrides the default remote.
09:36 gitinfo Rhonda: the git-config manpage is available at http://jk.gs/git-config.html
09:37 marianina8 joined #git
09:37 Rhonda SlashLife^m: Ah, right, will look into that, thanks.
09:37 leeN joined #git
09:39 SlashLife^m Okay; "git rev-parse --show-toplevel" gives you the repository root directly. :)
09:39 SlashLife^m *continues scripting*
09:40 peeps[lappy] joined #git
09:46 Maple_ joined #git
09:48 peeps[lappy] joined #git
09:52 peeps[lappy] joined #git
09:54 t0by joined #git
10:00 dmc joined #git
10:03 mischat joined #git
10:03 tvw joined #git
10:10 mattcen joined #git
10:10 sbasso joined #git
10:10 theoceaniscool joined #git
10:11 Dazzyp joined #git
10:12 aard_ joined #git
10:12 cyberz joined #git
10:14 manuelschneid3r joined #git
10:15 eihabarabia joined #git
10:18 parasite_ joined #git
10:19 MrcRjs joined #git
10:21 irqq joined #git
10:23 nowhere_man joined #git
10:25 King_Hual joined #git
10:25 King_Hual joined #git
10:25 nivag joined #git
10:26 MrcRjs joined #git
10:27 dcpc007 joined #git
10:28 elect joined #git
10:28 wcpan joined #git
10:29 marcogmonteiro joined #git
10:31 oka joined #git
10:31 Tobbi joined #git
10:31 maroloccio joined #git
10:33 _rht joined #git
10:37 theoceaniscool joined #git
10:42 mar77i_ joined #git
10:42 jnavila joined #git
10:42 theiostream joined #git
10:43 Cabanossi joined #git
10:45 dsdeiz joined #git
10:45 dsdeiz joined #git
10:47 theoceaniscool joined #git
10:50 wcpan joined #git
10:51 Skyfinn joined #git
10:52 qt-x joined #git
10:52 TheOrangeOne joined #git
10:53 fragMental joined #git
10:54 King_Hual` joined #git
10:58 ferr1 joined #git
10:58 hahuang61 joined #git
10:59 bket joined #git
11:00 DuckHuntDog joined #git
11:02 DuckHuntDog Why do I get merge conflicts when pulling into my clean, local master?
11:03 theiostream joined #git
11:03 DuckHuntDog Do I need to fetch and then reset
11:04 grawity maybe you have local commits which conflict with the remote branch's commits
11:05 grawity try `tig master origin/master` (assuming that's what you're pulling)
11:05 grawity or `gitk the_same`
11:06 WhiskerBiscuit joined #git
11:07 Darcidride joined #git
11:09 King_Hual` joined #git
11:11 King_Hual joined #git
11:11 King_Hual joined #git
11:11 ToBeCloud joined #git
11:12 thierryp joined #git
11:13 Skyfinn joined #git
11:14 MineCoins joined #git
11:16 basiclaser joined #git
11:16 wcpan joined #git
11:18 gugah joined #git
11:18 DuckHuntDog joined #git
11:18 DuckHuntDog thanks for the reply. I did have some diffs in my local master. fetch and reset helped.
11:19 DuckHuntDog I have managed to create a few branches with very similar names and now I'm wondering which ones have relevant unique commits
11:20 DuckHuntDog How do I get a list of all unique commits that are not in master, and their associated branchname
11:20 Dolos joined #git
11:22 sbasso joined #git
11:23 raspado joined #git
11:29 _ikke_ DuckHuntDog: git branch --no-merged master gives you all branches that haven't been merged in master yet
11:29 _ikke_ DuckHuntDog: then with git log --oneline master..<branchname>, you get the commits
11:29 masuberu joined #git
11:29 sarri joined #git
11:30 sarri joined #git
11:31 cagomez joined #git
11:33 Gloomy joined #git
11:34 bariscant joined #git
11:34 Ruler- does --no-merged recognize --squash merges?
11:38 thomas_oneill joined #git
11:38 thomas_oneill hey is there a git diff command to show only the modified and the untracked ?
11:41 mkoskar joined #git
11:41 wrouesnel1 joined #git
11:43 marianina8 joined #git
11:44 jast thomas_oneill: there is no git diff command that will show untracked files
11:45 snowalpaca joined #git
11:47 bongjovi joined #git
11:49 masuberu joined #git
11:52 dsantiago joined #git
11:53 wxg joined #git
11:53 SwiftMatt joined #git
11:55 MineCoins joined #git
11:57 fahadash joined #git
11:57 thomas_oneill jast: ah so I have to add those. But what about the deleted files, how can I ignore those? It shows every line of them in the diff. It would be nice if it did like --name-only or --name-status for the deleted files and only showed the diff for files that are modified (and the fresh ones I've added, new ones)
11:58 synthroid joined #git
12:00 jast thomas_oneill: --irreversible-delete (or -D)
12:03 thomas_oneill haha sounds so scary, just read in the man I guess it's to do with passing these things to patch/apply commands so makes sense, ty jast!
12:03 Stutters left #git
12:05 ssarah joined #git
12:07 livingstn joined #git
12:08 User458764 joined #git
12:08 qlkzy joined #git
12:09 finalbeta joined #git
12:10 fakenerd joined #git
12:10 synthroi_ joined #git
12:11 jameser joined #git
12:15 reznord is it possible to pull from master except for a particular folder?
12:16 grawity no
12:16 alexandre9099 joined #git
12:17 jameser joined #git
12:17 Silmarilion what would happen if I for instance I do a pull from remote and the directory which should be created already exists locally and it is untracked? Will the local dir be deleted?
12:18 CheckDavid joined #git
12:19 finalbeta joined #git
12:20 revoltingPeasant joined #git
12:21 osse Silmarilion: You'll get a warning and git will stop
12:22 theiostream joined #git
12:22 buffal0 joined #git
12:26 jameser joined #git
12:28 kinlo left #git
12:28 Silmarilion osse: apparently not. The files in the directory got preserved, directory itself was added and the new files from the pull where also added.
12:29 Cabanossi joined #git
12:29 jameser joined #git
12:31 masuberu joined #git
12:32 oskarkv joined #git
12:32 eclecticjohny joined #git
12:35 thinkpad joined #git
12:37 osse Silmarilion: Were there any file clashes?
12:37 Silmarilion no
12:37 ramsub07 joined #git
12:37 mizu_no_oto joined #git
12:37 Silmarilion osse: ^
12:37 osse Silmarilion: Then that explains it
12:38 Silmarilion btw this behavior is ok for me :)
12:38 osse Silmarilion: Usually git doesn't care that much about directories themselves.
12:40 math-alpha joined #git
12:41 synthroid joined #git
12:41 sbasso joined #git
12:43 ExoUNX joined #git
12:45 Chinggis6 joined #git
12:45 synthroi_ joined #git
12:48 rchavik joined #git
12:49 mar77i joined #git
12:51 User458764 joined #git
12:53 Gsham joined #git
12:53 MineCoins joined #git
12:58 chigang joined #git
12:58 hahuang61 joined #git
13:00 LionsMane joined #git
13:10 bsanford joined #git
13:12 Gsham joined #git
13:12 King_Hual joined #git
13:12 King_Hual joined #git
13:13 jnavila joined #git
13:15 Gloomy joined #git
13:15 pinkkis joined #git
13:16 adamru joined #git
13:18 theoceaniscool joined #git
13:18 sbasso joined #git
13:18 minn joined #git
13:20 chipotle joined #git
13:21 finalbeta joined #git
13:22 minn I'm looking at the man page for git diff, but not seeing any way for git diff -U0 to output a header when there are no changes (e.g., diff --git a/file1 b/file2 ...). Is this possible?
13:22 MineCoins joined #git
13:23 mkoskar joined #git
13:23 Vampire0 minn, if there are no changes, there is nothing to diff, no matter whether -U0 is used or not.
13:23 Vampire0 minn, what do you try to achieve / what do you need this for?
13:24 LBV_User joined #git
13:25 flaviodesousa joined #git
13:25 dsteplight__ joined #git
13:26 minn Vampire0: It would make parsing the output more uniform; it's really a matter of convenience.
13:27 Vampire0 minn, but there is no output for a file without change, because it did not change *confused*
13:30 jeffreylevesque joined #git
13:30 re1 joined #git
13:30 minn I suppose I was expecting a header with no hunks - apparently I was confused. I've just never diffed a file that didn't change before.
13:31 publio joined #git
13:32 oleo joined #git
13:33 chipotle joined #git
13:39 cyberz joined #git
13:40 Khisanth joined #git
13:40 Stummi which kind of sorcery is used to decide if a move and slight change is either a "renamed" change or a "delete and new file" change? Is there a way to influence how git recognizes the change?
13:41 canton7 Stummi, see e.g. -C and -M in man git log
13:41 gitinfo Stummi: the git-log manpage is available at http://jk.gs/git-log.html
13:42 Stummi ah, when its in git log I assume it isn't actually stored something in the history but "just" representation magic?
13:42 canton7 yep, it's git working it out after-the-fact
13:42 Sound joined #git
13:43 kpease joined #git
13:43 Stummi well, than I can stop searching for that in git add or commit ... ;)
13:43 Stummi I though git decides on adding whether its moved or a new file
13:43 DuckHuntDog left #git
13:43 canton7 !mv
13:43 gitinfo [!rename] git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also public-inbox.org/git/Pine.LNX.4.58.0504150753440.7211@ppc970.osdl.org and `diff.renames = true`  in man git-config
13:43 canton7 (see the link there for more info)
13:44 Cabanossi joined #git
13:45 DarkPsydeLord joined #git
13:47 mazert_ joined #git
13:49 King_Hual joined #git
13:49 King_Hual joined #git
13:50 bannakaffalatta joined #git
13:50 King_Hual joined #git
13:50 root____5 joined #git
13:51 mischat_ joined #git
13:52 Skyfinn joined #git
13:53 kpease_ joined #git
13:55 King_Hual joined #git
13:57 Dougie187 joined #git
13:58 al-damiri joined #git
13:58 cdown joined #git
14:01 navidr joined #git
14:05 LeMike joined #git
14:05 Derperperd joined #git
14:06 Derperperd joined #git
14:09 Derperperd joined #git
14:16 mar77i_ joined #git
14:17 tang^ joined #git
14:20 Es0teric joined #git
14:21 lordjancso joined #git
14:23 Es0teric joined #git
14:24 bariscant joined #git
14:25 kpease joined #git
14:25 byte512 joined #git
14:29 Cabanossi joined #git
14:34 Tobbi joined #git
14:35 boombatower joined #git
14:37 davimore joined #git
14:37 Es0teric joined #git
14:38 kpease joined #git
14:39 Es0teric joined #git
14:39 kpease_ joined #git
14:42 nckpz joined #git
14:43 User458764 joined #git
14:47 eihabarabia joined #git
14:47 LeBlaaanc joined #git
14:53 YuGiOhJCJ joined #git
14:55 theiostream joined #git
14:55 davimore joined #git
14:59 Snugglebash joined #git
15:00 hahuang61 joined #git
15:00 sydw joined #git
15:05 bannakaf_ joined #git
15:07 learning joined #git
15:07 wnjuwl joined #git
15:08 TbobbyZ joined #git
15:09 aw1 joined #git
15:11 aw1 joined #git
15:12 metsjeesus joined #git
15:15 _Vi joined #git
15:16 re1 joined #git
15:16 cagomez joined #git
15:17 sbasso joined #git
15:17 re1 joined #git
15:18 re1 joined #git
15:20 re1 joined #git
15:21 re1 joined #git
15:21 schleppel joined #git
15:22 re1 joined #git
15:23 re1 joined #git
15:23 snowalpaca joined #git
15:26 cdg joined #git
15:27 thiago joined #git
15:29 synthroid joined #git
15:29 Es0teric joined #git
15:29 sunri5e joined #git
15:30 Gustavo6046 joined #git
15:31 brent__ joined #git
15:31 maroloccio hi. how would you output the first commit of branch B whose diff introduced the word foobar anywhere in the repo? first == oldest
15:31 synthroi_ joined #git
15:32 Calinou joined #git
15:32 jstimm joined #git
15:33 zivester joined #git
15:34 Rodya_ joined #git
15:35 n1ce_ left #git
15:37 re1 joined #git
15:38 mischat joined #git
15:38 dreiss joined #git
15:38 theoceaniscool joined #git
15:39 Vampire0 maroloccio, `git log --oneline -Gfoobar | tail -n 1`
15:39 maroloccio Vampire0: if i needed more than --oneline, Vampire0 ?
15:40 Vampire0 maroloccio, `git log --oneline -Gfoobar | tail -n 1 | cut -d ' ' -f 1 | xargs git log`
15:40 Vampire0 maroloccio, `git log --oneline -Gfoobar | tail -n 1 | cut -d ' ' -f 1 | xargs -r git log`
15:41 rominronin joined #git
15:42 maroloccio oh, i see Vampire0.. some shell scripting magic :) can it not be done with git alone, just the program?
15:45 IRQ` joined #git
15:46 Darcidride joined #git
15:46 hotbobby if i have a fork, how can i bring it back in line with what it was forked from without going through each commit myself
15:48 Vampire0 maroloccio, not that I know of. You can tell log to only output one commit with "-1" and you can tell it to show the commits in reverse order with "--reverse" but unfortunately, the commit selection (show only one) is done before the order (reverse the order) so to my knowledge there is no way to express "show me only the last one of the resulting list" without shell scripting. But I might be wrong of cour
15:48 Vampire0 se
15:48 Vampire0 maroloccio, btw. you might want to add --all to the first log command, otherwise you only search in the current branch
15:48 Vampire0 maroloccio, `git log --oneline --all -Gfoobar | tail -n 1 | cut -d ' ' -f 1 | xargs -r git log`
15:48 menip joined #git
15:49 Vampire0 maroloccio, you can make this a git alias of course, then you can use that git alias and thus "git alone" kind of
15:50 Vampire0 hotbobby, you add the upstream as a second remote, then you merge or rebase the upstream branch and push to your fork
15:50 sydw I am relatively new to git, so I'm sorry if this is a dumb or obvious question: I have a remote repo origin/master which is related to local repo branch master. There is a parallel branch personal with remote origin/personal. If have personal checked out and I do 'git diff origin/master' there is some diff output, but if I want to merge it into personal by 'git merge origin/master', git says 'Already up-to-date'? What am I doing wrong? Thanks!
15:51 maroloccio Vampire0: nice touch. thanks. you are right. the question about doing this in git Vs some shell incantation remains though :)
15:52 bariscant joined #git
15:52 Vampire0 maroloccio, well, as I said, "youngest" would be easy, "oldest" will not work to my knowledge
15:52 maroloccio strange that it would not, even if i like your shell wizardry
15:52 jast sydw: 'git merge' only carries over changes that aren't included in the target branch yet, so running it a second time, for instance, has no effect. however, the target branch can, of course, have differences of its own that don't exist in the source branch, but 'git merge' doesn't magically erase them (and normally that's not what you want, anyway)
15:53 ToBeCloud joined #git
15:53 sydw jast: thanks so much
15:54 Vampire0 maroloccio, youngest would simply be `git log --all -1 -Gfoobar`
15:54 SmashingX joined #git
15:54 maroloccio Vampire0: which is nicely formulated like that. but oldest is more useful to me this time..
15:55 MrJoshua joined #git
15:55 synthroid joined #git
15:56 durham joined #git
15:57 Vampire0 sydw, next time you might want to do `git diff ...origin/master` which will show the changes between the latest common ancestor of your branch and origin/master with origin/master
15:57 einnjo joined #git
15:57 Vampire0 sydw, or `git log ..origin/master` which will list commits that are included in origin/master but not in your current branch
16:00 fakenerd joined #git
16:00 logos[m] joined #git
16:00 SmashingX joined #git
16:03 orbyt_ joined #git
16:03 madewokherd joined #git
16:05 a_thakur joined #git
16:06 puff Good noon, all.
16:07 Snugglebash joined #git
16:10 uebera|| joined #git
16:10 uebera|| joined #git
16:12 nd_ joined #git
16:13 learning joined #git
16:16 sydw Vampire0: fantastic, thanks for the tip!
16:17 Prothumos joined #git
16:20 Elzington joined #git
16:22 Gsham joined #git
16:22 sbasso joined #git
16:23 Gustavo6046_ joined #git
16:24 mischat joined #git
16:24 aw1 joined #git
16:25 peterbecich joined #git
16:26 jstimm joined #git
16:27 robotroll joined #git
16:30 fuzzybear3965 joined #git
16:31 svm_invictvs joined #git
16:33 dreiss joined #git
16:34 fahadash joined #git
16:35 raspado joined #git
16:35 TomyLobo2 joined #git
16:37 ryxxed joined #git
16:38 raspado_ joined #git
16:38 buffal0 joined #git
16:40 mischat joined #git
16:41 cagomez joined #git
16:43 Cabanossi joined #git
16:43 rivarun joined #git
16:44 cagomez joined #git
16:46 User458764 joined #git
16:46 kfoonamalik joined #git
16:48 UTAN_dev joined #git
16:51 mehola joined #git
16:52 SmashingX joined #git
16:52 Es0teric joined #git
16:56 qmm joined #git
16:56 brent__ joined #git
16:56 qmm if i fork from a repository and someone makes changes from the original project, how do i pull in those changes?
16:56 grawity `git remote add`, then the usual fetch + merge / fetch + rebase / pull / pull --rebase
16:57 cagomez joined #git
16:58 Gustavo6046 joined #git
16:59 mischat joined #git
16:59 cagomez joined #git
17:01 lmatteis joined #git
17:01 hahuang61 joined #git
17:01 ehynds joined #git
17:03 InfoTest joined #git
17:03 Zialus joined #git
17:03 jstimm joined #git
17:05 Es0teric joined #git
17:06 ehynds joined #git
17:07 cjohnson I call the remote for the original "upstream"
17:08 jagob joined #git
17:09 pzp joined #git
17:13 peterbecich joined #git
17:13 tyreld joined #git
17:13 peterbec` joined #git
17:15 porsche944 joined #git
17:16 Noldorin joined #git
17:16 sgrover joined #git
17:18 sbasso joined #git
17:19 sgrover Looking for insights.  We have three branches in this case - develop, feature1, feature2.  Feature1 was merged to develop on March 10th with via a merge --squash.  Feature2 was merged the same way a couple days ago.  Both modified the styles.scss file by adding a line at the same line number.  So far so good.
17:20 nevodka joined #git
17:20 sgrover Now, Feature1 needs to be reverted because there are more changes.  That results in a conflict on the styles.scss, resolved via a checkout --theirs.
17:21 sgrover Made my changes, and am now doing merge --squash of feature1 to develop again.  Conflict on the styles.scss - same issue.
17:21 matoro joined #git
17:21 sgrover Thing is feature1 should not be "aware" of feature2, and vice versa.
17:21 sgrover This seems to be a workflow issue.  Any insights??  Thanks.
17:24 f3r70rr35f joined #git
17:24 porsche944 any time git tells me my branch can be fast-forwrded does that simply mean there's no need for a 3-way merge
17:24 gopar joined #git
17:25 sgrover The concern is that we may deploy one feature to production, without the other, and we don't want to commit a change that includes both features.
17:26 learning joined #git
17:26 King_Hual joined #git
17:27 sgrover porsche944: I believe you are right, but I don't consider myself an expert, take that with the normal amount of skepticsm.. :)
17:27 porsche944 ok
17:27 porsche944 it sounds like you know more than me though with your fancy squashing
17:27 sgrover :) just a way to roll up many commits into a single merging commit.
17:27 TbobbyZ_ joined #git
17:28 cjohnson It also makes it harder for git to resolve changes
17:28 cjohnson which I believe is the cause of your current issue
17:28 cjohnson sgrover: it seems to me that what you want is tags
17:28 cjohnson if you just want to be able to mark "this is a completed feature", you can use a tag to do that
17:28 cjohnson without having to modify history
17:29 sgrover hmm.. basically we are dealing with long running branches for feature development and need to be able to merge/revert those branches to the develop branch easily.
17:29 cdg joined #git
17:29 sgrover a simple merge includes all the supporting commits for the feature, so reverting means reverting ALL those commits.
17:29 sbasso joined #git
17:30 sgrover Wouldn't the tag idea have the same issue?
17:30 bsanford joined #git
17:30 cjohnson so you are squashing for the ability to revert?
17:30 sgrover we know we can revert anyways.  We are squashing for a much simpler revert.
17:31 SmashingX joined #git
17:31 theoceaniscool joined #git
17:32 cjohnson I dunno it just doesn't seem like squash is really giving you much benefit here
17:32 cjohnson anyway, my approach instead is to never merge develop to master
17:32 sgrover just reading up on tags.  If I merge a tag, it's a single commit?  The historical commits on the tag don't come across?
17:33 cjohnson disregard the tags suggestion, I thought you were using squashes for tidy history annotation
17:33 sgrover cjohnson: you do a git checkout BRANCH /file ?
17:33 sgrover on master I mean...
17:33 maroloccio joined #git
17:33 cjohnson What I do is, new features are branched from master, and merged into develop to test on
17:33 cjohnson once a feature is ready I merge the feature to master
17:33 peterbecich joined #git
17:33 cjohnson Obviously this approach doesn't work for everybody
17:34 cjohnson but it gives me the ability to leave a long-lived feature on develop while still shipping others
17:34 sgrover understood.  We have two review branches - develop and useracceptance.  All our features have to go through those.
17:37 revoltingPeasant joined #git
17:38 TbobbyZ joined #git
17:41 thiago_ joined #git
17:41 shinnya joined #git
17:42 hahuang61 joined #git
17:44 Es0teric joined #git
17:46 a_thakur joined #git
17:46 kexmex joined #git
17:47 sgrover when in doubt, try it.  Merging a tag includes the history behind that tag too.  Same as merging the branch.  Makes sense.
17:47 Es0teric joined #git
17:48 Glooomy joined #git
17:49 maarhart joined #git
17:49 Es0teric joined #git
17:50 ok91 joined #git
17:50 nowhere_man joined #git
17:53 drodger joined #git
17:55 paws_ joined #git
17:57 jagob joined #git
17:58 peterbec` joined #git
17:59 SlashLife joined #git
18:00 osxi_ joined #git
18:01 drodger joined #git
18:02 thiago_ joined #git
18:02 theiostream joined #git
18:02 [Brain] joined #git
18:03 Impaloo joined #git
18:03 justan0theruser joined #git
18:04 dreiss joined #git
18:05 peterbec` joined #git
18:05 ozmage joined #git
18:05 hashtagstrashtag joined #git
18:06 drodger joined #git
18:06 sbasso joined #git
18:07 TikityTik joined #git
18:08 theiostream joined #git
18:10 devster31 joined #git
18:10 moop joined #git
18:12 Rodya_ joined #git
18:12 ertesx joined #git
18:13 NimeshNeema joined #git
18:14 Sasazuka joined #git
18:15 maarhart joined #git
18:17 WhiskerBiscuit joined #git
18:18 lucido-cl joined #git
18:21 patarr_ joined #git
18:22 Jellyg00se joined #git
18:22 patarr_ Hello. I'm having an issue where a staging to master PR was squashed and merged to master. Now whenever a branch is cut off of master and PR'd to staging, the github diff contains an enormous amount of changes (from the squashed commit) that isn't _actually_ different from what's in staging.
18:22 patarr_ What is the easiest way to resolve this with minimal impact?
18:24 buffffal00 joined #git
18:25 maarhart joined #git
18:27 TbobbyZ_ joined #git
18:27 cdg joined #git
18:27 peterbec` joined #git
18:28 bsanford joined #git
18:30 thierryp joined #git
18:31 a_thakur joined #git
18:34 User458764 joined #git
18:37 skalpin patarr_: the diff shouldn't contain anything that isn't different. What makes you think the diff is incorrect?
18:38 patarr_ skalpin: because the lines of code that are shown in the diff are in both branches.
18:38 SwiftMatt joined #git
18:38 patarr_ master has everything that staging has.
18:38 patarr_ I think this issue is occurring because of a squash commit being present in the master branch, but obviously not in staging.
18:39 patarr_ Even though the line content is the same, git must think its different because its part of a different commit.
18:39 bwn joined #git
18:40 buffal0 joined #git
18:41 skalpin patarr_: I wonder if the line endings changed or something like that
18:45 synthroid joined #git
18:46 patarr_ skalpin: nope. Entire lines are showing up. Not whitespace changes.
18:47 bezhermoso joined #git
18:47 bezhermoso joined #git
18:47 aielima joined #git
18:48 livingstn joined #git
18:51 navidr joined #git
18:51 skalpin can you past a little of it into a gist?
18:51 skalpin I don't understand how that can happen
18:51 bannakaffalatta joined #git
18:51 Ferris____ left #git
18:52 diana__ joined #git
18:53 patarr_ skalpin: master is one commit ahead of staging (the squashed commit), and X behind staging (obvious dev progress on staging)
18:54 patarr_ On staging line "def foo" is from me, and my feature branch. On master line "def foo" is from a squashed commit another dev created.
18:54 mehola joined #git
18:55 maarhart joined #git
18:56 bwn joined #git
18:56 diana__ Thanks!  Hi, I'm looking for some guidance over branching and storing changes after a stakeholder changed her mind about the order of web updates
18:58 diana__ I have to update 2 products on a brand website, I started working on one an pushed from local branch to a remote for staging  (not out main branch) I'm about to star working on the second product, but she just notified my that changes to the first product will have to wait to be published.
18:59 diana__ How can continue to update product 2, push to remote and then to main branch without pushing changes to product one, but without loosing changes done to product 1 either?
18:59 Anthaas joined #git
19:00 MrcRjs joined #git
19:00 dminuoso diana__: keep them in separate folders or repositories even?
19:01 dminuoso keeping two products in the same repo seems like a mistake to me
19:02 diana__ the repo is for the whole website. I created a new local branch for product 1, but now has been merged to remote for staging
19:02 dminuoso What do oyu mean by "product" ?
19:02 dminuoso Are those features?
19:02 Ownix joined #git
19:02 metsjeesus left #git
19:02 SmashingX joined #git
19:03 theiostream joined #git
19:03 dminuoso diana__: You could start using feature branches and keep that product 1 work in a feature branch you just stop using for a while.
19:03 stealthii joined #git
19:03 diana__ no, this a brand website, the brand offers 20 different products, they are launching 2 new products.
19:03 dminuoso diana__: Sounds like a "feature" in git terminology to me.
19:04 diana__ I see, that's why I created a new local branch, but merged into develop branch for staging..
19:04 Cabanossi joined #git
19:04 Murii joined #git
19:05 kutenai joined #git
19:05 diana__ problem is, if I create a new feature branch, will include changes done for product 1..
19:05 dminuoso diana__: You could checkout the old commit when you started product 1
19:05 dminuoso start a new branch off that
19:05 dminuoso and rename things.
19:05 cstrahan joined #git
19:05 dminuoso so that this new branch (based on the old commit) becomes your new development branch
19:06 diana__ I see, will give that a try. thank you!
19:06 dminuoso diana__: If you have other changes mixed in between you have to cherry-pick or rebase
19:06 lebster joined #git
19:07 diana__ ok
19:07 diana__ have to head for a meeting, but thanks for the suggestion
19:07 TbobbyZ joined #git
19:07 sbasso joined #git
19:11 TbobbyZ joined #git
19:12 theiostream joined #git
19:13 adymitruk joined #git
19:14 luke_nukem joined #git
19:16 satifant joined #git
19:16 t-mart joined #git
19:16 anuxivm joined #git
19:16 inflames joined #git
19:20 cagomez joined #git
19:23 joshszep_ joined #git
19:23 peterbec` joined #git
19:23 peterbecich joined #git
19:25 roentgen joined #git
19:26 mikecmpbll joined #git
19:26 cdg joined #git
19:27 idmistir joined #git
19:27 idmistir joined #git
19:27 vatican joined #git
19:28 synthroi_ joined #git
19:28 djb-irc joined #git
19:28 User458764 joined #git
19:29 vatican how do I chacnge git bash character set so i don't get following error:
19:29 vatican Unknown OS character set 'cp720'.
19:29 vatican Switching to the default character set 'latin1'.
19:29 vatican for mysql
19:31 cyberz joined #git
19:32 theiostream joined #git
19:32 peeps[lappy] joined #git
19:33 Random832 vatican, are you running git bash in a console window or mintty?
19:34 vatican Random832, Windows
19:34 dsdeiz joined #git
19:34 dsdeiz joined #git
19:34 Cabanossi joined #git
19:35 vatican Random832, I don't know what's minnty, I'm in bash enviroment.
19:35 Random832 vatican, easiest way to answer is can you easily resize the window without getting a horizontal scroll bar
19:35 Random832 though if you're on windows 10 that might not be accurte
19:35 vatican yes i can resize
19:35 vatican i'm in 10
19:36 Random832 the issue is there are two possible programs that git bash can run inside and i'm not sure which one is default
19:36 vatican :/ how do we know then?
19:37 Random832 wait duh
19:37 Random832 echo $TERM what does it say
19:37 vatican I always choose "Git Bash here" after right clicking in the project.
19:37 Random832 yeah that doesn't help me, what does echo $TERM say
19:37 vatican xterm
19:37 Random832 ok
19:38 Random832 anyway the answer i was going to give doesn't actually change - run cmd, chcp 65001, then exit from cmd - it's just that the side effects it might have are different
19:39 matoro joined #git
19:40 Random832 or just ignore the warning and run "charset utf8" inside the mysql client or use --default-character-set utf8
19:40 Random832 that might be cleaner
19:40 nebodka joined #git
19:40 Random832 https://dev.mysql.com/doc/refman/5.7/en/charset-connection.html
19:41 Random832 just be aware though, programs that aren't part of git bash aren't necessarily always going to run cleanly inside it, and you might want to run mysql from a cmd window instead
19:42 Silenced_v2 joined #git
19:42 vatican yessss, --default-character-set utf8 fixed the issue, thank you very much :D
19:43 bariscant joined #git
19:43 setuid left #git
19:44 amosbird joined #git
19:45 sbasso joined #git
19:52 oafoegnrubgu joined #git
19:52 patarr joined #git
19:53 livingstn joined #git
19:55 MrcRjs joined #git
19:55 sydw left #git
19:56 mehola joined #git
19:56 matoro joined #git
19:56 govg joined #git
19:59 bjonnh joined #git
20:00 bjonnh would in my .gitignore  foo/**/*!.gpg   ignore anything that is not a gpg file in the directory "foo" and all the subfolders?
20:00 InfoTest joined #git
20:01 robotroll joined #git
20:02 chitopunk joined #git
20:02 axisys joined #git
20:06 raijin joined #git
20:09 cdown joined #git
20:10 MrcRjs joined #git
20:12 dust_ joined #git
20:13 jwmann joined #git
20:13 dfgergunueh joined #git
20:13 jstimm joined #git
20:17 cagomez joined #git
20:24 Sasazuka_ joined #git
20:24 raijin joined #git
20:26 synthroid joined #git
20:26 dsdeiz joined #git
20:26 lucazz joined #git
20:26 MrcRjs joined #git
20:33 matoro joined #git
20:33 cdg joined #git
20:33 Atm0spher1c joined #git
20:34 Cabanossi joined #git
20:39 Elodin joined #git
20:40 Elodin A friend of mine was asking me about using git for his "cad" files. Is this something git could take care of? Being those binary files and all.
20:41 MrcRjs joined #git
20:43 perlpilot Elodin: It could, though probably not very efficiently
20:43 Elodin but its not like it will brak things cuz binaries right?
20:43 perlpilot Elodin: Maybe better if he always used DXF file  :)
20:44 perlpilot no, it won't break because they're binaries
20:44 Elodin allright
20:44 gugah joined #git
20:44 puff I just did a pull and it automerged three files and had a conflict.  I fixed the conflict, but I'd like to see a "diff" of the changes for the automerged files.  How do I do this?
20:45 puff I did "git log -n 3" on each of the automerged files but the changes all appear to be from my own commits.
20:45 sbasso joined #git
20:46 dsdeiz joined #git
20:46 dsdeiz joined #git
20:48 cdg joined #git
20:49 yanome joined #git
20:49 trondth joined #git
20:50 ktca joined #git
20:52 raijin joined #git
20:53 tvw joined #git
20:53 puff Dagnabbit... and I just realized that I made some commits on the wrong branch. Hm.
20:54 perlpilot puff: luckily you're using git, so it's easily remedied.  :)
20:56 MrcRjs joined #git
20:56 hvxgr joined #git
20:56 puff perlpilot: Good... how?
20:57 bsanford joined #git
20:57 puff perlpilot: Luckily I haven't pushed yet.  I tried to, but there was a conflict.
20:58 _Vi joined #git
20:58 perlpilot puff, you could use rebase.
20:58 peeps[lappy] joined #git
20:58 perlpilot There's a nice graphical tutorial at http://learngitbranching.js.org/
20:58 MrcRjs joined #git
20:59 puff perlpilot: Thanks.
20:59 zezba9000 joined #git
20:59 zezba9000 does git-lfs now ship with git 2.12.1?
20:59 zezba9000 I installed that version of git and now I have git-lfs 2.0.1 out of the box
21:00 zezba9000 I don't see it in the git folder though so wondering where it gets installed?
21:01 puff I created a feature branch, checked it out, then I had to interrupt that, did "git stash", checked out to another branch, then accidentally checked out back to the wrong feature branch (albeit one that had already been pushed to the shared repo and merged) and did "stash pop", git add/commit.
21:01 theiostream joined #git
21:01 puff And then tried to push to the shared repo, got warned about changes on the shared repo, pulled, merged, rebuilt/tested, added/committed those changes... and then realized I'm on the wrong branch.
21:02 zzz joined #git
21:02 Murii joined #git
21:02 ShapeShifter499 joined #git
21:03 bjonnh left #git
21:03 ramsub07 joined #git
21:03 twisted` joined #git
21:05 Sasazuka_ joined #git
21:07 _Vi Will there be Git users survey?
21:07 dsdeiz joined #git
21:08 theiostream joined #git
21:09 Es0teric joined #git
21:12 synthroi_ joined #git
21:13 puff Hm, it seems like I might be better off just cherry picking the two commits.
21:13 nevodka joined #git
21:13 bwn joined #git
21:14 jost_ joined #git
21:16 he4d joined #git
21:16 einnjo joined #git
21:18 matoro joined #git
21:19 cyberz joined #git
21:21 _ikke_ .version
21:21 gitinfo _ikke_: .version: still at 2.12.1, not updating topic.
21:21 _ikke_ too early
21:21 cyphase joined #git
21:22 zxd joined #git
21:22 zxd hi
21:22 zxd in https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging  they show , $ git show :1:hello.rb > hello.common.rb
21:22 zxd where in the manual is this :1:hello.rb syntax
21:22 zezba9000 will git 2.12.1+ contain git-lfs on Linux/OSX in the future as well? Or is this a Windows only thing. Odd its not in the release notes.
21:23 sbasso joined #git
21:24 cyberz joined #git
21:25 felixjet joined #git
21:27 dmidma joined #git
21:27 askb joined #git
21:27 dmidma left #git
21:27 damdouma joined #git
21:28 cagomez does git commit -am also stage & commit files that are under "changes not staged for commit"?
21:30 aacn500 joined #git
21:30 Dazzyp joined #git
21:31 _ikke_ yes
21:31 _ikke_ that's what -a does
21:32 Elodin left #git
21:33 cyberz joined #git
21:34 learning joined #git
21:35 ajaXHorseman joined #git
21:36 Abbott joined #git
21:37 pietv joined #git
21:37 jeffreylevesque joined #git
21:38 j7k6 joined #git
21:38 gigq joined #git
21:40 Sound joined #git
21:41 gopar joined #git
21:41 cagomez joined #git
21:43 Seveas zezba9000: git-lfs is a separate project. "git for windows" is not just git, but a bundle of git and related tools.
21:43 ResidentBiscuit joined #git
21:44 Abbott left #git
21:45 cyberz joined #git
21:45 zezba9000 Seveas: I understand this. Its more a question of will it be shipped with macOS the same way I guess.
21:46 Seveas the git project doesn't ship anything besides source code, so ask whoever build git for osx for you (homebrew?)
21:47 zezba9000 whoever does this I guess then: https://sourceforge.net/projects/git-osx-installer/
21:47 Seveas that'd be https://sourceforge.net/u/timcharper/profile/
21:48 zezba9000 so on macOS is using "brew install git" the best way to get git?
21:48 Seveas no idea, I don't use fruitmachines :)
21:49 javaJake joined #git
21:49 ramsub07 joined #git
21:49 zezba9000 Seveas: lol, I'm making a Git GUI tool that will support macOS is why I'm asking
21:50 zezba9000 anyway I'll test and figure it out
21:50 sbasso joined #git
21:50 _ikke_ Seveas: lol
21:52 hashtagstrashtag joined #git
21:52 cyberz joined #git
21:52 cagomez joined #git
21:53 bannakaffalatta joined #git
21:54 cdown joined #git
21:55 bezhermoso joined #git
21:57 mazica joined #git
22:00 bwn joined #git
22:01 dsdeiz joined #git
22:01 raijin joined #git
22:06 Ranhir joined #git
22:06 Dougie187 left #git
22:07 CheckDavid joined #git
22:08 matoro joined #git
22:09 sbasso joined #git
22:11 mist1231 joined #git
22:11 nmb joined #git
22:13 mist1231 hey guys, i created a branch, did some commits and then did a pull request. someone reviewd it and noticed a file/commit that shouldn't be commited. What do i do to "remove" that specific commit
22:13 mist1231 sorry for asking what might seem to be a rudimentary question but im new to commit and what to do this the right way
22:13 preaction mist1231: rebase -i is commonly used for this
22:13 hhee joined #git
22:13 mist1231 the two tools i have are pycharm and github web interface
22:14 mist1231 i see two buttons, one called rebase and one rebase my github fork
22:14 paramourne joined #git
22:16 bremner mist1231: mostly we only know/support the command line interface here.
22:16 bremner maybe someone will help if you wait.
22:16 mist1231 aha, well i guess i might have the commandline installed
22:16 mist1231 i assume i must to be using git at all, even as a plugin for pycharm
22:19 davix joined #git
22:19 mist1231 yeah so i started git bash bremner, would you be able to guide me form here?
22:19 emerson joined #git
22:20 mist1231 i've browsed to the repository and i'm in the correct branch
22:20 mist1231 i can see the commit in git log that i want to "delete"
22:22 dsdeiz joined #git
22:22 dsdeiz joined #git
22:22 bremner mist1231: ok, make a note of the commit hash and/or the first line of the commit message.
22:23 bremner then run "git rebase -i $parent"  where $parent is the hash of the commit just before the one you want to delete.
22:23 bremner (the log goes backwards, so the one after in the log)
22:23 mist1231 ooof bremner, i already followed an instruction from http://christoph.ruegg.name/blog/git-howto-revert-a-commit-already-pushed-to-a-remote-reposit.html
22:23 mist1231 i did the git revert thing =x
22:23 bremner ok.
22:24 mist1231 should i not have done that?
22:24 bremner it depends what your goal is.
22:24 mist1231 this file will be deleted in another commit from another branch
22:24 mist1231 i accidentally commited a file that is not directly tied to the branch i am working on
22:24 mist1231 so really, i just want to not commit any changes to that file
22:25 livingstn joined #git
22:25 mist1231 and by doing revert, it performs a new commit that undos what the previous commit had done
22:25 bremner ok, but after the revert, the file is OK right?
22:25 mist1231 yeah
22:25 bremner so, what you have now is the easy solution, if you can live with the two commits.
22:25 mist1231 se this adds a commit to the history that undos a previous one, which is fine with me
22:25 bremner I'd say stick with what you have then.
22:25 mist1231 excellent, thank you for the help bremner
22:26 Balliad joined #git
22:26 bremner no worries.
22:26 gugah joined #git
22:26 cagomez joined #git
22:26 gugah joined #git
22:26 nikitasius joined #git
22:28 ahrs joined #git
22:29 cagomez joined #git
22:29 masuberu joined #git
22:30 gopar joined #git
22:32 gopar joined #git
22:32 fedepad joined #git
22:33 Doginal joined #git
22:33 midnightmagic joined #git
22:34 r00tine joined #git
22:34 r00tine left #git
22:38 livingstn joined #git
22:39 qassim_ left #git
22:40 qassim joined #git
22:41 skyfaller joined #git
22:41 skyfaller joined #git
22:42 sbasso joined #git
22:43 chitopunk joined #git
22:43 jozwior joined #git
22:45 alexandre9099_ joined #git
22:45 King_Hual joined #git
22:48 NeverDie joined #git
22:48 mist1231 joined #git
22:51 madewokherd joined #git
22:52 robattila256 joined #git
22:54 brent__ joined #git
22:54 gopar joined #git
22:56 raijin joined #git
22:58 einnjo joined #git
22:59 dsdeiz joined #git
23:00 matoro joined #git
23:00 netj joined #git
23:08 safe joined #git
23:16 raijin joined #git
23:17 chipotle joined #git
23:17 medeirosthiiago joined #git
23:18 de-vri-es joined #git
23:20 Cabanossi joined #git
23:20 King_Hual joined #git
23:20 King_Hual joined #git
23:21 snowalpaca joined #git
23:23 zezba9000 left #git
23:25 chitopunk joined #git
23:27 mda1 joined #git
23:30 Sasazuka joined #git
23:31 justanotheruser joined #git
23:33 King_Hual joined #git
23:33 King_Hual joined #git
23:34 chipotle joined #git
23:34 sbasso joined #git
23:35 jascot[m] joined #git
23:35 learning joined #git
23:36 anuxivm left #git
23:38 raijin joined #git
23:42 ahrs joined #git
23:42 Oatmeal joined #git
23:48 Rotaerk joined #git
23:50 Cabanossi joined #git
23:53 matoro joined #git
23:54 gopar joined #git
23:55 overlord_tm joined #git
23:55 ReptilianBrain joined #git
23:55 krillr joined #git
23:56 cyberz joined #git
23:58 de-vri-es joined #git
23:58 f3r70rr35f joined #git

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