Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-12

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

All times shown according to UTC.

Time Nick Message
00:00 askb joined #git
00:00 joshszep joined #git
00:02 tristanp joined #git
00:02 ozmage joined #git
00:04 GodGinrai joined #git
00:07 askb joined #git
00:07 fstd_ joined #git
00:09 danemacmillan joined #git
00:10 matsaman joined #git
00:10 e01 joined #git
00:10 enckse joined #git
00:10 e01 joined #git
00:11 storrgie joined #git
00:11 clemf joined #git
00:13 enckse joined #git
00:14 Gsham joined #git
00:14 storrgie joined #git
00:21 notebox joined #git
00:21 meadmoon joined #git
00:22 ljc joined #git
00:25 matoro joined #git
00:27 SwiftMatt joined #git
00:33 dave0x6d joined #git
00:38 tristanp joined #git
00:43 pur3eval joined #git
00:43 kyan joined #git
00:43 bongobrown joined #git
00:44 Vampire0 joined #git
00:44 fstd joined #git
00:46 Richard_Cavell Hi everyone.  I have a working directory with a project.  Someone online insisted that I post my code to github.com, so I did.  He gave me the commands, and there is a .git directory in my working directory.  Since then I've been typing $git push when I wanted to commit (because I don't know git), and my wd is out of sync with github and git commit won't fix it.  What do I do?
00:47 memfrob try git pull then git push again
00:48 Richard_Cavell $git pull results in: There is no tracking information for the current branch. Please specify which branch you want to merge with.
00:49 memfrob Ok, where are you starting from?
00:49 memfrob Does git checkout master work?
00:50 memfrob If you properly cloned your tree you shouldn't have to do that.
00:50 Richard_Cavell If I do that will it wipe my recent changes?
00:51 memfrob ok so you already made changes.
00:51 bongobrown left #git
00:51 memfrob what does git branch -a say?
00:51 Richard_Cavell * master
00:51 Richard_Cavell remotes/origin/master
00:51 memfrob what does git log say?
00:51 rogi joined #git
00:52 Gsham joined #git
00:52 mehola joined #git
00:52 memfrob does git log have your recent change? i.e. did you make a commit?
00:52 raatiniemi joined #git
00:53 Richard_Cavell git log output: http://ideone.com/IU9vmZ
00:53 memfrob better yet, does git diff HEAD say anything
00:53 Richard_Cavell git diff HEAD produces 4 pages of output
00:53 memfrob ok thats probably why
00:54 memfrob run git add -A
00:54 memfrob then git commit -as
00:54 modin joined #git
00:55 Richard_Cavell Yes, that seems to have worked.  git diff HEAD now has no ouptut
00:55 memfrob then git push should work, if not, git push origin +master
00:56 rewt joined #git
00:56 memfrob if the first one doesn't work then something is wrong though
00:56 Richard_Cavell git push worked
00:56 memfrob nooicee
00:56 Richard_Cavell Okay, I'm a bit more relaxed now.  Thanks
00:56 Richard_Cavell So if I want to commit from now on, what do I type?
00:57 Richard_Cavell (I'm the only committer, I'm just putting my code up for another guy to look at)
00:57 memfrob no problem man, you ever need anything join this channel, we're all git experts with no egos.
00:57 durham joined #git
00:57 Raed joined #git
00:57 Nugget joined #git
00:58 memfrob git add -A means to add everything (new files, folders, etc) in the work directory to git, i.e. to track them
00:58 memfrob if you're only modifying files that already exist in the git tree and are being tracked, I use git commit -as
00:59 memfrob -a = "Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected."
00:59 memfrob -s is just a sign off message, so it says signed off by <your name and email>
01:00 memfrob it makes it look nicer and not like you're trying to be an anonymous coward.
01:00 Richard_Cavell So to remove certain files from the list of files that git versions, should I do git rm --cached filename ?
01:00 MattMaker joined #git
01:00 matsaman joined #git
01:00 rwp joined #git
01:00 sharpy joined #git
01:00 memfrob you want to stop tracking a file in git but leave the file in the work tree? that sounds like a bad idea.
01:01 flo[m]1 joined #git
01:01 chipotle joined #git
01:02 FiveBroDeepBook joined #git
01:02 memfrob i personally never do that but if you want git to stop tracking a file, you just add the file (and path if necessary) to .gitignore
01:02 __main__ joined #git
01:02 m0ltar joined #git
01:02 caliculk joined #git
01:03 Richard_Cavell How do I remove them from github?
01:03 memfrob as if they never existed and re-write history or the good way?
01:03 Richard_Cavell The good way
01:04 memfrob ah, just rm -rf file/directory then run git add -A again thats what i do
01:04 Richard_Cavell No, I want them to exist on my computer but not at github
01:04 Richard_Cavell For example, object files
01:05 memfrob You should add object files and auto-gen'd files to .gitignore but if you already added it by mistake, git rm --cached <file>
01:06 memfrob then do ensure it's done right, git rm --cached -r . && git add .
01:06 memfrob s/do/to/
01:06 FiveBroDeepBook left #git
01:06 memfrob that will make sure files in .gitignore are not tracked
01:07 memfrob HEH! I know more about git than I thought I did.
01:07 Richard_Cavell memfrob:  I have run git rm --cached on the files, and it appears to have removed them from versioning.  But they're still on github.
01:07 qpdb joined #git
01:07 memfrob you committed it?
01:07 jagobdue joined #git
01:07 Richard_Cavell yes
01:08 memfrob OH RIGHT! sorry. ok re-add the file to git and track it, then move the file outside of the git directory, then run git add -A again
01:09 memfrob and you're going to need to remove the file from .gitignore if you did that already.
01:09 sharpy joined #git
01:10 memfrob then in git commit -as it should mention that the file was deleted.
01:10 memfrob there's probably another way to do that without moving the file outside of the git tree but that's what i do to keep myself sane.
01:10 Richard_Cavell They're still there on github
01:11 memfrob was the file deleted in git commit ?
01:11 Richard_Cavell No, doesn't look like it
01:11 IntruderSRB joined #git
01:12 memfrob you need to make sure the file is tracked again first
01:12 memfrob if it doesn't show up in git commit then it won't show up on github
01:13 Richard_Cavell Okay, they're versioned and they're in the working directory.  What about a git rm filename?
01:14 memfrob you can use that too, i personally don't.
01:15 memfrob hence why i didn't think of it earlier :P
01:15 Richard_Cavell I ran it but it's still on github
01:15 memfrob was it deleted in git commit ?
01:16 memfrob does git commit --amend show that you deleted the file?
01:16 Richard_Cavell http://ideone.com/8n0LCy Here's the output
01:16 memfrob git config --global user.name "Richard Cavell"
01:16 memfrob git config --global user.email your@email.here
01:17 Richard_Cavell ok done
01:17 memfrob git commit --amend --reset-author
01:17 mnaser joined #git
01:17 memfrob then git push
01:18 notebox joined #git
01:18 knigitz joined #git
01:18 memfrob imma pull my hair out if that doesn't work
01:19 * memfrob gets ready to point a gun at his own head
01:19 matsaman =)
01:19 Richard_Cavell Don't do that
01:20 Richard_Cavell It worked.  Thanks.
01:20 Richard_Cavell Now when I've done some work, I go $git commit -as; git push   correct?
01:20 tristanp_ joined #git
01:22 memfrob yes, git commit -as makes the commit and has you sign off on it, git push sends it to the server
01:23 Richard_Cavell Okay goood.  That's all I want to learn about git for now.
01:24 memfrob hawsome!
01:27 memfrob so what VCS do you usually use? SVN? CVS Pharmacy?
01:27 carpii joined #git
01:27 memfrob Something tells me you usually don't use hg or bzr.
01:28 pandeiro joined #git
01:29 redhedded1 joined #git
01:29 mischat joined #git
01:29 sharpy joined #git
01:31 arescorpio joined #git
01:31 memfrob Too much C programming, I'm gunna go game for awhile. I'll be back another day. Take care everyone!
01:32 afuentes joined #git
01:36 Vampire0_ joined #git
01:37 tristanp_ joined #git
01:43 rewt joined #git
01:46 jameser joined #git
01:46 johnny56 joined #git
01:47 astrofog joined #git
01:48 cdg joined #git
01:51 tristanp joined #git
01:52 johnny56 joined #git
01:57 d1z joined #git
01:59 tristanp joined #git
02:00 MattMaker joined #git
02:02 tristanp joined #git
02:02 dreiss joined #git
02:11 tristanp joined #git
02:13 rgrinberg joined #git
02:15 finalbeta joined #git
02:16 tristanp joined #git
02:21 waveclaw joined #git
02:22 pks joined #git
02:22 tristanp joined #git
02:23 Vampire0_ joined #git
02:24 tristanp joined #git
02:25 Xe joined #git
02:25 tristanp joined #git
02:27 justan0theruser joined #git
02:30 tristanp joined #git
02:31 tristanp joined #git
02:32 tristanp joined #git
02:32 pur3eval joined #git
02:37 jimi_ joined #git
02:38 ertes joined #git
02:38 Wulf4 joined #git
02:39 miczac joined #git
02:46 tristanp joined #git
02:47 tristanp_ joined #git
02:50 dcy joined #git
02:51 jameser joined #git
02:56 d^sh joined #git
03:01 ozmage joined #git
03:02 ojdo joined #git
03:06 tristanp joined #git
03:09 tristanp joined #git
03:11 ffilozov joined #git
03:11 c0ded joined #git
03:15 johnny56 joined #git
03:15 tristanp joined #git
03:16 tristanp joined #git
03:18 Vortex34 joined #git
03:20 Vinnie_win_d joined #git
03:21 cdg_ joined #git
03:23 reconx86 joined #git
03:24 rogerraymond joined #git
03:25 tristanp joined #git
03:25 cceckman joined #git
03:26 Vinnie_win joined #git
03:27 reconx86 joined #git
03:28 fstd_ joined #git
03:29 cceckman Greetings, qq: I have two repositories, X and Y. Y is a submodule of X. User A doesn't have (direct) access to Y, but does have access to X. Do they continue to not have access to Y, i.e. their submodule fetch will fail?
03:29 chachasmooth joined #git
03:30 hexagoxel joined #git
03:33 carpii yes, submodules are seperate repo's, so they need permission to those too
03:33 carpii and if not, then submodule fetch will fail
03:33 reconx86 joined #git
03:33 jimi_sanchez joined #git
03:33 Ryanar joined #git
03:34 cceckman carpii: Great- thanks!
03:34 carpii np
03:36 cceckman Is this a typical pattern? Google turns up a couple of mentions of it.
03:36 kadoban No, it sounds mostly useless. What use is a repo with submodules that other people won't have access to?
03:37 cceckman kadoban: publish my configuration for (dotfiles, monitoring stack, etc.) but keep the specific login secrets (nickserv password, API keys, etc) separate
03:38 carpii yeah i guess the only use cases are security related
03:38 cceckman Since someone cloning it would need to branch anyway
03:38 carpii but it renders the parent repo useless anyway so...
03:38 carpii may aswell deny access to that too
03:39 cceckman carpii: Eh, useless for cloning maybe, not for reference altogether, I'd say
03:39 AustinMatherne joined #git
03:40 tristanp joined #git
03:40 carpii well yeah true
03:43 ismithers joined #git
03:45 ankit01ojha joined #git
03:47 justanotheruser joined #git
03:47 pur3eval joined #git
03:48 raijin joined #git
03:49 chipotle joined #git
03:55 pumafied joined #git
03:56 Emperor_Earth joined #git
03:58 jameser joined #git
04:01 kruncher left #git
04:03 sunri5e joined #git
04:10 Groovin joined #git
04:10 GroovinDB joined #git
04:14 JelmerD joined #git
04:18 slappymcfry joined #git
04:19 mohabaks joined #git
04:21 jeffspeff joined #git
04:24 shinnya joined #git
04:28 jeffspeff joined #git
04:31 freezer joined #git
04:32 Nilesh_ joined #git
04:35 Cabanoss- joined #git
04:37 pks joined #git
04:39 UserOO7 joined #git
04:41 shgysk8zer0_ joined #git
04:50 endiruna joined #git
04:57 Puffball joined #git
05:01 jameser joined #git
05:03 pur3eval joined #git
05:08 dsdeiz joined #git
05:08 dsdeiz joined #git
05:11 safe joined #git
05:13 notebox joined #git
05:20 MattMaker joined #git
05:22 kisonecat joined #git
05:24 mohabaks joined #git
05:25 hussam joined #git
05:27 durham joined #git
05:31 MattMaker joined #git
05:33 MattMaker joined #git
05:34 cbreak joined #git
05:34 nd_ joined #git
05:37 CIAguy- joined #git
05:49 FiveBroDeepBook joined #git
05:50 jameser joined #git
05:54 FiveBroDeepBook left #git
05:54 datahead8888 joined #git
05:56 datahead8888 left #git
05:56 datahead8888 joined #git
05:58 snapfractalpop joined #git
05:59 MattMaker joined #git
05:59 snapfractalpop Anyone using this: https://github.com/github/gitignore/blob/master/Android.gitignore in Android Studio?
06:00 matsaman using other people's boilerplate .gitignore files (or indeed anything) seems problematic
06:03 jagob joined #git
06:05 jeffspeff joined #git
06:09 FiveBroDeepBook joined #git
06:11 Guest9 joined #git
06:13 nuck joined #git
06:14 FiveBroDeepBook left #git
06:15 kevr joined #git
06:16 snapfractalpop matsaman: what's your solution? do you learn all the idiosyncracies of the IDE and manually create a gitignore each time?
06:17 kevr so i was attempting to rebase -i so i could remove a commit from a merge, and i ended up just letting rebase merge everything over. how can i use git rebase -i to exclude specific commits?
06:17 kevr is there an example somewhere of -i's content?
06:17 snapfractalpop kevr: any reason not to revert?
06:18 matsaman snapfractalpop: yup
06:18 kevr i just did a git reset --hard to a good commit before the extras
06:18 matsaman also if something requires that many special overrides, I want to know it does
06:19 kevr snapfractalpop: but i want to basically merge another branch onto master, but i wanna exclude some commits from the other branch
06:19 kevr google said this is possible with git rebase -i
06:19 pur3eval joined #git
06:19 snapfractalpop matsaman: hm.. I'm debating this because I still haven't decided whether IDE things belong in the git history for my android projects
06:19 snapfractalpop kevr: revert is different from reset
06:19 snapfractalpop it keeps the history, IIRC
06:20 matsaman snapfractalpop: I think it'll be unlikely anything to do with your local IDE won't have local user specific paths and strings within them
06:20 matsaman ideally such things would not even be under your git, IMO
06:20 matsaman to need to be ignored in the first place
06:21 snapfractalpop matsaman: true.. but I can't be totally sure, since I'm not 100% familiar with AS
06:21 kevr snapfractalpop: oh, i see, well that's fine, i just removed the history from master, i still have it on the other branch
06:21 snapfractalpop matsaman: also, there can be binary assets created in the build process, etc.
06:21 * matsaman shrugs
06:22 matsaman it's not personal, but I trust what I know, not what others tell me
06:22 snapfractalpop matsaman: my concern is that I don't know what all should / shouldn't be included as best practice
06:22 matsaman well there's no harm looking at what people include
06:22 matsaman I just wouldn't substitute it wholesale with learning what to include for yourself
06:23 snapfractalpop I know that not *everything* should be included.. and some tutorials keep using "git add ." or "git add -a" which in my case is wrong for sure
06:23 matsaman a lot of people do that, they substitute other people's choices; I find that problematic =D
06:24 kevr great, i just rebased and completely removed a commit that i wanted to keep
06:24 kevr ugh
06:24 snapfractalpop matsaman: yeah.. I'm thinking of more as a starting point, using a boilerplate .gitignore to see what particular directories the IDE shouldn't be versioning.. then researching further
06:24 snapfractalpop kevr: it may still exist somewhere
06:24 matsaman well what's nice is git will tell you all the new files
06:24 acetakwas joined #git
06:24 matsaman so it should be apparent what you will want to ignore
06:24 matsaman or not
06:25 matsaman as long as your first commit isn't after editing 80,000 files =P
06:25 snapfractalpop matsaman: haha true
06:25 MattMaker joined #git
06:25 snapfractalpop btw, I use tig sometimes..
06:25 d4f4s joined #git
06:26 matsaman tig seems pretty cool
06:26 snapfractalpop quite handy little git tool
06:26 snapfractalpop it helped me learn staging chunks and whatnot
06:27 kevr it's not about excluding files
06:27 kevr basically
06:28 kevr say i have a master branch, and i wanna create a branch that has some custom files in it, so i commit a special commit on the new branch that says something like "Development files", and then i make a bunch of other commits on that branch, and i wanna merge everything into master _except_ for the commit for "Development files"
06:28 kevr so i was trying to do that
06:28 snapfractalpop kevr: the commit that you removed may still be present .. just don't do a clean
06:28 kevr indeed
06:28 kevr where would i get the commit from?
06:28 kevr i dropped it in the rebase
06:29 aavrug joined #git
06:29 nuck joined #git
06:29 snapfractalpop kevr: do you have the hash of the commit?
06:29 MineCoins joined #git
06:30 kevr no, git log didn't show the commit anymore, luckily the server still had the commit so i just pulled it back
06:30 snapfractalpop git reflog?
06:30 snapfractalpop ah.. nevermind then.
06:30 kevr oh shit, what the fuck
06:30 kevr it just duplicated a bunch of commits
06:30 kevr T_T
06:31 snapfractalpop kevr: you rebased.. so the state was different
06:31 snapfractalpop if your server has the exact state you want, you can force pull
06:31 snapfractalpop otherwise, the rebase you did locally will prevent a clean pull
06:31 kevr well fuck
06:31 kevr alright
06:31 kevr thanks
06:32 snapfractalpop also, if you didn't have the server, you may still have been able to find the "lost" commit with git reflog
06:36 acetakwas joined #git
06:38 snapfractalpop also git fsck --lost-found
06:44 Guest28675 joined #git
06:47 _ng joined #git
06:58 a3Dman joined #git
06:58 vivu joined #git
07:00 dermoth joined #git
07:02 rivarun joined #git
07:03 acetakwas joined #git
07:03 dave0x6d joined #git
07:09 MACscr joined #git
07:17 acetakwas joined #git
07:25 Electrometro joined #git
07:31 clemf joined #git
07:36 ronny joined #git
07:41 snapfractalpop left #git
07:47 Oatmeal joined #git
07:47 Guest85 joined #git
07:49 xbob joined #git
07:53 aavrug joined #git
07:54 Derperperd joined #git
07:56 e01 joined #git
07:56 e01 joined #git
07:59 m4sk1n joined #git
08:08 pur3eval joined #git
08:25 Murii joined #git
08:33 afuentes joined #git
08:35 theoceaniscool joined #git
08:36 Ardethian joined #git
08:40 thinkpad joined #git
08:44 WayToDoor joined #git
08:54 Hink joined #git
08:55 thinkpad joined #git
09:01 _main_ joined #git
09:02 _main_ joined #git
09:02 Hink joined #git
09:04 glebihan joined #git
09:04 __main__ joined #git
09:05 jameser joined #git
09:12 DBag joined #git
09:15 govg joined #git
09:18 robotroll joined #git
09:19 dersand joined #git
09:27 d1z hello
09:32 xmajedz joined #git
09:32 xmajedz git commit suicide
09:33 venmx joined #git
09:38 j7k6 joined #git
09:40 thinkpad joined #git
09:41 mohabaks joined #git
09:41 Ozymandy joined #git
09:43 d1z I have a git repository that I'm constantly working on (laptop), and I want it to be cloneable from my vps. I've already set the git user in my system, added a public key for the vps and proceeded to attempt a git clone (the server cloning my local git repo) via git clone git@mydomain.com:/srv/git/myproject.git, however I get a fatal error, make sure the repository exists
09:44 metachr0n joined #git
09:45 thinkpad joined #git
09:46 Derperperd joined #git
09:47 d1z bah
09:48 d1z it was a dumb mistake, I was actually doing git@mydomain.com:PORT:/srv/git/myproject.git and I was getting the error that :PORT:/srv/git/myproject.git didn't exist... ofc
09:54 YuGiOhJCJ joined #git
09:56 pur3eval joined #git
09:57 thinkpad joined #git
09:58 a3Dman joined #git
09:58 cris_ joined #git
10:17 Wulf joined #git
10:23 synthmeat joined #git
10:23 m4sk1n joined #git
10:23 catsup joined #git
10:24 catsup joined #git
10:25 jimi_ joined #git
10:25 jimi_ joined #git
10:33 miczac joined #git
10:36 pbrewczynski joined #git
10:38 flavius joined #git
10:39 a3Dman joined #git
10:39 DBag joined #git
10:40 jimi_sanchez joined #git
10:46 cris_ joined #git
10:46 Hudu joined #git
10:46 mohabaks joined #git
10:47 d1z is it possible to clone the git with working index as well? I mean the changes that haven't been commited
10:52 vivuroy joined #git
10:53 _ikke_ nope
10:54 King_Hual joined #git
10:55 CheckDavid joined #git
10:58 leeN joined #git
11:01 vivuroy joined #git
11:03 govg joined #git
11:06 vivuroy joined #git
11:06 DDBag joined #git
11:14 Limes joined #git
11:16 Derperperd joined #git
11:17 jnavila joined #git
11:17 eroux joined #git
11:18 j7k6 joined #git
11:19 pks joined #git
11:19 mehola joined #git
11:20 c0c0 joined #git
11:21 pks joined #git
11:22 tmk joined #git
11:23 pks joined #git
11:24 pks joined #git
11:25 pks joined #git
11:26 pks joined #git
11:27 vivuroy joined #git
11:29 elsevero joined #git
11:30 94KAAM2NX joined #git
11:33 diogenese joined #git
11:37 flavius d1z: Clone or merge?
11:38 mrBen2k2k2k joined #git
11:38 flavius Your question doesn't make sense, if you have "an index", you've already cloned it
11:38 mikecmpbll joined #git
11:40 d1z flavius: sorry I meant the stage
11:40 d1z the actual file changes that haven't been commited, but are present at file system level
11:41 flavius d1z: so your question is then: is it possible to merge, while having something on the stage?
11:41 flavius not clone, merge
11:43 j7k6 joined #git
11:45 pur3eval joined #git
11:45 govg joined #git
11:46 blackwind_123 joined #git
11:46 apotry joined #git
11:47 FiveBroDeepBook joined #git
11:48 Jackneill_ joined #git
11:50 ChiLL_SurF joined #git
11:53 ertesx joined #git
11:54 dbl4k joined #git
11:54 notebox joined #git
11:57 FiveBroDeepBook joined #git
11:57 cojack joined #git
11:57 acetakwas joined #git
11:59 cojack hello guys, I have a simple question about git alias, im creating new alias like:  git config --global alias.bump '!bump_version', where bump_version is function from external file included as: ~/.oh-my-zsh/custom/scripts/git/bump_version.sh and body of this function is here: https://gist.github.com/cojack/8347bd679f82997ebce65ab44e7b1fe4 could some one explain me why after reload zsh I've got an error like: fatal: While expanding alias 'bump'
11:59 cojack 'bump_version': No such file or directory. Thanks in advance
12:00 apotry joined #git
12:03 jmd joined #git
12:04 jmd How do I do a git bisect across a merge ?
12:04 jozwior joined #git
12:07 FiveBroDeepBook left #git
12:08 dwts_ left #git
12:09 d1z flavius: uhm, I don't know if that is exactly equivalent,. Basically I have a remote vps where I do the tests. And I have a repo in my laptop and at github. I'm trying to upload code from my laptop to the vps without actually having to commit the changes into the history (sometimes), so I need a setup where git helps upload even the workspace itself, but without copying the entire directory to a remote instead
12:09 d1z (via scp), as that also brings all the files that are gitignored whilst doing it somehow with git allows me to upload just the changes to the files
12:09 jameser joined #git
12:10 borkr joined #git
12:11 d1z that are part of the git project. doing it outside git would have to be full of --ignores of files because there are many very well sized files inside the directory of the repo that cannot be constantly pulled up towards the server
12:11 m0viefreak joined #git
12:11 robotroll joined #git
12:12 d1z s/pulled up/uploaded
12:20 mehola joined #git
12:24 sbulage joined #git
12:26 jottr joined #git
12:26 govg joined #git
12:28 j7k6 joined #git
12:29 Wulf joined #git
12:30 Limes joined #git
12:31 efeuska joined #git
12:33 DDDBag joined #git
12:33 tibi77 joined #git
12:34 afuentes joined #git
12:34 inflames joined #git
12:38 Glooomy joined #git
12:38 nettoweb joined #git
12:41 tibi771 joined #git
12:41 mischat joined #git
12:47 nostrora joined #git
12:48 jnavila joined #git
12:50 ankit01ojha joined #git
12:51 santagada joined #git
12:52 tibi771 left #git
12:58 zzz joined #git
13:00 jottr_ joined #git
13:00 tmk joined #git
13:03 cdg joined #git
13:05 notebox joined #git
13:07 vivuroy joined #git
13:11 manuelschneid3r joined #git
13:16 jottr joined #git
13:16 miczac joined #git
13:18 Balliad joined #git
13:19 WayToDoor joined #git
13:21 d1z joined #git
13:23 basiclaser joined #git
13:23 dviola joined #git
13:24 jameser joined #git
13:28 WayToDoor joined #git
13:32 nostrora joined #git
13:32 Tobbi joined #git
13:34 pur3eval joined #git
13:39 e01 joined #git
13:40 satifant joined #git
13:42 mischat joined #git
13:45 manuelschneid3r joined #git
13:46 mischat joined #git
13:47 yqt joined #git
13:47 jameser joined #git
13:48 WayToDoor joined #git
13:48 narendraj9 joined #git
13:53 j7k6 joined #git
13:59 xmajedz joined #git
14:02 re1 joined #git
14:03 cdg joined #git
14:04 t0by joined #git
14:04 t0by joined #git
14:04 Gsham joined #git
14:07 DBag joined #git
14:07 j7k6 joined #git
14:10 Vampire0_ joined #git
14:11 NullableTruth joined #git
14:13 Vampire0 joined #git
14:14 xbob joined #git
14:15 Ranmaru joined #git
14:15 jameser joined #git
14:16 xlegoman joined #git
14:19 cs_shadow joined #git
14:21 nostrora joined #git
14:22 rostam joined #git
14:22 jameser joined #git
14:23 rostam Hi git question. I have a git repo with two branch (master, DEMO1).  If in one branh (master) I use git reset head (need to do this to sync with remote github) when I want to switch the other branch (DEMO), I get complains: error: your local changes to the following files would be overwitten by checkout.  How can I manage this please?
14:25 _ikke_ rostam: git reset HEAD would not do very much (except for untaging staged changes)
14:25 _ikke_ What command are you executing precisely?
14:27 rostam _ikke_, git reset <commit id>
14:32 rostam _ikke_, my git repo is a local clone of remote git repository (github). I have done some changes to my local file system, which is not needed to push to remote git. So I created a branch and reset the maser branch to the point without those changes in order to pull from remote git.
14:33 e01 joined #git
14:33 e01 joined #git
14:34 byte512 joined #git
14:35 _ng joined #git
14:38 sunri5e joined #git
14:38 Vampire0_ joined #git
14:44 Murii joined #git
14:45 theoceaniscool joined #git
14:46 dave0x6d joined #git
14:46 jimi_ joined #git
14:46 khisanth_ joined #git
14:48 dviola joined #git
14:48 e01 joined #git
14:55 Murii joined #git
14:55 Bizkit joined #git
14:55 danielmahon joined #git
14:57 _ikke_ rostam: right, git reset <commit> only resets where the current branch points to (and the index), but not the working tree
14:58 Tobbi joined #git
14:59 rostam _ikke_, how can I push selectively to uppers stream, by that I mean some of my local changes I don't wish to push upsream? thanks
15:01 loopsmark joined #git
15:02 GavinMagnus joined #git
15:02 govg joined #git
15:02 loopsmark joined #git
15:02 _ikke_ rostam: commit them on a separate branch, or do not commit them at all
15:02 Cogitabundus joined #git
15:04 raijin joined #git
15:06 loopsmark Hi, one question, I don't know if my problem is the workflow or my knowledge, we work in modularized software, and we use branches for each module, then when the module changes are ok we do a merge request to the master
15:06 Vampire0 joined #git
15:06 loopsmark the problem is, when people are working on his module (branch) and the master moves ahead, this could be 100 of commits irrelevant to the module, we do a rebase from master, but that leaves every branch full of commits that are not relevant to the module
15:07 loopsmark is there a way to keep the log clean? is the best solution to actually create a master for each module?
15:08 nedbat loopsmark: sounds like you'd be better off with a separate repo for each module
15:09 nicoulaj joined #git
15:09 loopsmark nedbat: yes, this is what I though
15:09 loopsmark thought*
15:11 rostam _ikke_, thanks
15:11 loopsmark but this means a bit of overhead of keeping track of all the repos
15:12 nedbat loopsmark: yes
15:13 _ng joined #git
15:14 justanotheruser joined #git
15:14 loopsmark because I was also thinking if there was a possibility to make a branch in a way that only keep track of specific files while it keeps the other at a main repo level
15:19 mischat joined #git
15:20 loopsmark but maybe that doesn't make sense at all
15:20 miczac joined #git
15:21 dsdeiz joined #git
15:21 dsdeiz joined #git
15:22 cdg_ joined #git
15:23 pur3eval joined #git
15:24 SwiftMatt joined #git
15:25 robattila256 joined #git
15:25 notebox joined #git
15:26 Gravious joined #git
15:26 Gravious hi
15:26 gitinfo Gravious: 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.
15:26 Kulrak joined #git
15:26 Kulrak joined #git
15:26 Gravious wow nice thanks gitinfo :D
15:26 gitinfo Gravious: you're welcome, but please note that I'm a bot. I'm not programmed to care.
15:26 Gravious ok!
15:27 Gravious why do some git commands return an exit code of 128?
15:27 moritz example?
15:27 Gravious according to http://www.tldp.org/LDP/abs/html/exitcodes.html this is reserved for invalid arg to exit
15:27 Gravious moritz, here, http://git.baserock.org/cgit/delta/git.git/tree/builtin/apply.c#n29
15:29 moritz Gravious: sounds about right
15:29 Gravious seems pretty deliberate that they're returning 128 there, so i wondered if there's maybe some obscure reason for it
15:30 d1z joined #git
15:31 shgysk8zer0_ joined #git
15:32 DBag joined #git
15:32 moritz Gravious: the documentation you've found refers to bash's built-in exit() function, not to the C exit function
15:32 Gravious this is true
15:33 Gravious but still, it seems that perhaps it's not the best choice of exit code?
15:34 moritz dunno
15:36 kaldoran joined #git
15:38 tmk joined #git
15:39 dcy joined #git
15:39 grayjoc joined #git
15:41 j7k6 joined #git
15:44 Levex joined #git
15:47 nedbat Gravious: why do you mind that error code?
15:47 Gravious because in bash it's ambiguous
15:47 Gravious nedbat, http://www.tldp.org/LDP/abs/html/exitcodes.html
15:48 nedbat Gravious: as moritz said, that's just saying what the exit builtin will return.
15:48 nedbat Gravious: it has no bearing on other commands
15:49 Gravious so now i have to know what something was implemented in to interpret the exit code?
15:50 moritz Gravious: there's no global convention that you can rely on for exit code meaning, ecept 0 == success, 1 == some sort of error/failure
15:50 sgen joined #git
15:50 moritz erm, != 0 implies some sort of error/failure
15:50 Gravious if it's ok to return 128 why not start returning 139 which is what bash will give you if a program segfaults?
15:51 Tobbi joined #git
15:52 moritz Gravious: if you care so deeply, make a pull request that changes the exit code to something that you find more tasteful. It's likely that it'll either be merged, or somebody explains why it's like it is right now
15:52 * Gravious nods
15:52 nedbat Gravious: there is not a strong convention for the meaning of status codes across applications.
15:52 Gravious okay cool, i'll make a patch :)
15:52 Gravious nedbat, sure but we may as well at least *try* :)
15:52 moritz but I find that fascination with a simple number in a pretty big code base quite puzzling
15:53 nedbat Gravious: i agree that uniform status codes would be better, and hardcoded 128 seems strange.
15:53 Gravious moritz, i just happened across it is all, and some of us were surprised by a return value of 128
15:53 souther joined #git
15:56 jnavila joined #git
15:58 SteffanW joined #git
15:59 cojack joined #git
16:01 MineCoins joined #git
16:02 _sfiguser joined #git
16:03 _sfiguser hello all, a question about merge management...
16:04 _sfiguser if i'm working on a git repo, i just downloaded it... then i work and make some modifications... then i want to merge with a remote branch ... but at this point another one has already modified the branch, how should i manage  ?
16:08 moritz _sfiguser: that depends on the upstream branch; some prefer that you merge the changes, others that you rebase
16:08 moritz *upstream project
16:10 madewokherd joined #git
16:10 _sfiguser moritz, but if we rebase we lose the changes made by someone else...
16:11 moritz _sfiguser: a rebase generally doesn't lose any changes, you just have to be careful with tracking meta data when multiple people work on the same branch
16:11 cagomez joined #git
16:15 osse st. moritz
16:15 cojack left #git
16:16 osse _sfiguser: And after cloning you use fetch to update the remote branches later
16:17 FiveBroDeepBook joined #git
16:20 mischat joined #git
16:21 _sfiguser ok guys but should i use rebase or merge ?
16:22 ^7heo Either or
16:22 moritz _sfiguser: ask the developers of the upstream project what they prefer
16:22 mehola joined #git
16:23 j7k6 joined #git
16:23 pur3eval joined #git
16:25 ThunderChicken joined #git
16:26 diogenese joined #git
16:26 efeuska joined #git
16:31 Limes joined #git
16:34 Levex joined #git
16:34 Wulf joined #git
16:36 skinkitten joined #git
16:36 skinkitten_ joined #git
16:36 arnoldoree joined #git
16:36 _sfiguser hello all i have a github account and working on my project... i want another user to be allowed to push to my repo... how can i do this ?
16:37 TomyLobo joined #git
16:39 prg318 joined #git
16:41 moritz _sfiguser: in the github web interface: settings -> Collaborators
16:41 Guest9 joined #git
16:42 ash_workz joined #git
16:44 Gsham joined #git
16:45 noteness joined #git
16:45 _sfiguser moritz once i do a git pull, how can i fix conflicts ?
16:46 FiveBroDeepBook joined #git
16:46 FiveBroDeepBook left #git
16:46 moritz _sfiguser: !conflict
16:46 gitinfo _sfiguser: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
16:54 [Brain] joined #git
16:55 mikecmpbll joined #git
16:56 mda1_ joined #git
16:58 Brain joined #git
16:59 FiveBroDeepBook joined #git
17:00 Bizkit joined #git
17:00 FiveBroDeepBook left #git
17:01 mda1 joined #git
17:10 JanC_ joined #git
17:11 Levex joined #git
17:12 muldover joined #git
17:13 muldover joined #git
17:14 muldover joined #git
17:15 Jellyg00se joined #git
17:16 muldover joined #git
17:19 IntruderSRB joined #git
17:19 PioneerAxon joined #git
17:21 mischat joined #git
17:23 muldover01 joined #git
17:24 nowhereman joined #git
17:27 navidr joined #git
17:28 clemf joined #git
17:29 PioneerAxon joined #git
17:30 thiago joined #git
17:30 Starky joined #git
17:33 d1z joined #git
17:36 dreiss joined #git
17:37 jost_ joined #git
17:38 cyphase joined #git
17:38 GT4066 joined #git
17:39 nettoweb joined #git
17:44 Levex joined #git
17:45 vdv joined #git
17:46 menip joined #git
17:48 halpmi joined #git
17:48 BackEndCoder joined #git
17:49 santagada joined #git
17:49 djb-irc joined #git
17:50 meZee joined #git
17:50 halpmi is there a way to run a diff between a previous commit on the master branch (eg jd29dh3h) and the final commit on a separate branch?
17:50 _ikke_ halpmi: git diff master~ branchname
17:51 halpmi hi _ikke_, thanks. what does the ~ represent?
17:52 _ikke_ The first 'ancestor' of the commit (ie, it's parent)
17:52 jnavila joined #git
17:53 _ikke_ halpmi: see man gitrevisions
17:53 gitinfo halpmi: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
17:54 atomi joined #git
17:57 rgrinberg joined #git
17:57 halpmi _ikke_: got it, thanks again!
18:00 YuGiOhJCJ joined #git
18:00 DBag joined #git
18:01 xall joined #git
18:01 DDBag joined #git
18:07 cdown joined #git
18:07 djb-irc joined #git
18:08 mda1 joined #git
18:12 pur3eval joined #git
18:13 ozmage joined #git
18:21 mischat joined #git
18:23 j7k6 joined #git
18:26 mehola joined #git
18:32 astrofog joined #git
18:32 kasual joined #git
18:34 raijin joined #git
18:35 qguv joined #git
18:36 jon-mac joined #git
18:36 Noldorin joined #git
18:40 notebox joined #git
18:41 phantombeta joined #git
18:41 phantombeta left #git
18:46 PioneerAxon joined #git
18:48 Levex joined #git
18:55 Whiskey joined #git
18:57 notebox joined #git
18:57 raijin joined #git
18:57 mda1_ joined #git
18:57 eb0t joined #git
18:57 Derperperd joined #git
19:00 Anonymous2016 joined #git
19:00 Whiskey Hay everyone
19:00 Whiskey I try to ignore folders in my gitignore but i don´t get it to work
19:01 cagomez joined #git
19:01 Whiskey the folders are "Backup|Old|Deleted" and are in diffrent folders in the source
19:01 rewt have they been committed already?
19:02 Whiskey rewt i have just try to start use git so no not really, its just not start to ignore it when i do my first comment
19:02 Whiskey i did try to ignore them whit "**/Backup/*
19:02 rewt so in `git status`, they show under "Untracked files"?
19:03 Whiskey well i don´t have that option i just don´t see it in my git status
19:03 Whiskey but i guss thats the same
19:03 Whiskey i have another thing i ignore that works and don´t show under git status so thats work
19:03 rewt if they don't show up at all, then they're ignored
19:04 Whiskey I told about others now
19:04 Whiskey to just say how i see it
19:04 rewt pastebin the output of `git status`
19:04 Whiskey No i know what it does
19:05 tmk joined #git
19:05 rewt you're not being clear, so the easiest way to help is to see exactly what you see
19:06 Whiskey but something i don´t know about is that i addded a new folder in my root directory of my git
19:06 Whiskey "Test/Delete/testfile.something" and "git add -A" and "git status" don´t show it at all hmmm
19:07 Sheogorath[m] joined #git
19:07 Whiskey it just ignore the the "Delete" folder if it works right? and show test as empty folder
19:08 Whiskey I don´t take images
19:08 Whiskey upload it somewhere jesus
19:09 rewt if it doesn't show in git status, it's ignored (or same as the committed version)
19:10 Whiskey rewt, is it someway to make git always do git add -A automatic and always be indexed before a commit insted of do it manuall?
19:11 Whiskey yeh it was ignored strange
19:11 e01 joined #git
19:13 pur3eval joined #git
19:15 Anonymous2016 left #git
19:16 tmk joined #git
19:16 alexandre9099 joined #git
19:18 Gsham joined #git
19:19 mohabaks joined #git
19:22 blokeybloke joined #git
19:22 Spuri0us joined #git
19:22 sprremix joined #git
19:24 Somelauw joined #git
19:25 Somelauw git doesn't respect locale, because doing git commit prints date as Feb 12 instead of printing the date normally.
19:26 loopsmark joined #git
19:26 e01 joined #git
19:26 e01 joined #git
19:27 elijah joined #git
19:27 peterR`` joined #git
19:28 d1z joined #git
19:28 LiftLeft joined #git
19:28 peterR`` can you work on two "experimental" branches at the same time and switch between then with wild abandon?
19:28 Timvde joined #git
19:29 Hello71 peterR``: why not
19:29 nedbat peterR``: it be better to switch between them with discipline and care, but sure.
19:29 e01 joined #git
19:29 peterR`` lol, OK
19:29 peterR`` but is it just one command to switch?
19:30 Hello71 git checkout
19:30 nedbat peterR``: you have to commit your changes if you are changing files.
19:30 peterR`` oh
19:30 peterR`` so you can't have two branches with uncommitted changes right?
19:31 Hello71 you can't put "uncommited changes" on a branch
19:31 Hello71 branches hold commits (sort of)
19:31 rewt or stash them temporarily
19:32 Hello71 that's not really a good example of something wrong with what I said
19:32 rewt yeah, misread the can't for can
19:32 Hello71 it's that you can put a commit on multiple branches, and branches technically only *point* to cmmits
19:32 Hello71 I see.
19:32 peterR`` OK, I see
19:32 peterR`` thanks
19:32 Hello71 you can use git stash to make a "temporary commit"
19:32 Whiskey How do i remove a commit=?
19:33 Hello71 which is stored on a sort of 'git stash branch'
19:33 Hello71 (in this context)
19:33 Hello71 !undo
19:33 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
19:33 SwiftMatt joined #git
19:33 dviola joined #git
19:33 peterR`` I will just commit - I just didn't know what I was doing :)
19:34 Whiskey like if i do "git commit -a -m "some commit" and then need to remove it
19:34 Whiskey most be a easy way to remove last commit
19:35 Hello71 git reset HEAD^
19:35 Whiskey but is it always first commit that be deleted if lets say i have made 5
19:36 Whiskey git revert commit-id maybe?
19:37 Hello71 !undo
19:37 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
19:37 j7k6 joined #git
19:37 stevenbenner joined #git
19:38 danemacmillan joined #git
19:39 WayToDoor joined #git
19:42 Vgr joined #git
19:42 Vgr joined #git
19:42 Vgr joined #git
19:42 Vgr joined #git
19:43 spinningarrow[m] joined #git
19:43 kikijiki[m] joined #git
19:43 dyce[m] joined #git
19:43 M-meznak joined #git
19:43 Sri[m] joined #git
19:43 am2on joined #git
19:43 KevinMGranger[M] joined #git
19:43 saintaquinas[m] joined #git
19:43 unclechu joined #git
19:43 elwan7[m] joined #git
19:43 aviraldg joined #git
19:43 srkrishna[m] joined #git
19:43 Jarrah[m] joined #git
19:43 alaeri[m] joined #git
19:43 anand[m] joined #git
19:44 dikiaap joined #git
19:44 Remramm joined #git
19:44 SpEcHiDe joined #git
19:44 musicmatze[m] joined #git
19:44 monomon[m] joined #git
19:44 Salander27 joined #git
19:44 Guest17683 joined #git
19:44 daopu[m] joined #git
19:44 UncleCJ joined #git
19:44 patrickr[m] joined #git
19:44 flo[m] joined #git
19:44 hiq[m] joined #git
19:44 unilovelight[m] joined #git
19:44 hallogallo[m] joined #git
19:45 matoro joined #git
19:46 nettoweb joined #git
19:46 mehola joined #git
19:47 mellernoia joined #git
19:47 mda1 joined #git
19:48 zeroed joined #git
19:48 Shakeel_ joined #git
19:48 onmeac joined #git
19:49 valize joined #git
19:51 SwiftMatt joined #git
19:52 jagob joined #git
19:54 b3kN joined #git
19:59 Motoko joined #git
20:01 j7k6 joined #git
20:01 Levex joined #git
20:03 mehola joined #git
20:05 Lunatrius joined #git
20:05 BlessJah_ joined #git
20:10 denisMone joined #git
20:10 durham joined #git
20:11 levex_ joined #git
20:11 clemf joined #git
20:11 nettoweb joined #git
20:12 durham joined #git
20:12 BlessJah joined #git
20:20 matoro joined #git
20:23 Gravious joined #git
20:23 mischat joined #git
20:25 snits joined #git
20:27 pR0Ps joined #git
20:27 anuxivm joined #git
20:28 chipotle joined #git
20:30 mischat joined #git
20:33 e01 joined #git
20:33 e01 joined #git
20:33 mda1 joined #git
20:35 helmet33 joined #git
20:36 Guest93151 joined #git
20:36 d1z joined #git
20:40 Doow joined #git
20:41 j7k6 joined #git
20:43 menip joined #git
20:43 jnavila joined #git
20:45 Orbitrix joined #git
20:45 Orbitrix joined #git
20:47 Gsham joined #git
20:48 nedbat the help for git clone says, "--no-single-branch [will] fetch the histories near the tips of all branches."  It seems like it also fetches the histories near tags.  Is this true?
20:49 Phylock joined #git
20:52 Balliad joined #git
20:52 msonntag joined #git
20:54 DBag joined #git
20:55 raynold joined #git
20:56 pks joined #git
20:58 DBag left #git
20:59 Timvde joined #git
21:02 pur3eval joined #git
21:05 borkr joined #git
21:11 jimklo joined #git
21:14 GavinMagnus left #git
21:15 Balliad joined #git
21:16 canuk joined #git
21:20 BSAlb joined #git
21:23 d1z joined #git
21:25 Electrometro joined #git
21:26 Balliad joined #git
21:27 l4v2 joined #git
21:29 notebox joined #git
21:30 mehola joined #git
21:31 Goplat joined #git
21:34 askb joined #git
21:36 Jellyg00se joined #git
21:39 elsevero joined #git
21:39 elsevero joined #git
21:39 dreaddymck joined #git
21:39 nettoweb1 joined #git
21:44 Gsham joined #git
21:45 Keverw joined #git
21:47 boombatower joined #git
21:48 Tobbi joined #git
21:49 d1z joined #git
21:51 arecaceae joined #git
21:54 miicha joined #git
21:57 jimklo joined #git
21:58 Vampire0_ joined #git
22:00 tristanp joined #git
22:02 pur3eval joined #git
22:04 jlawall joined #git
22:06 dHoard left #git
22:09 jlawall Hello,  I have the impression that it is not possible to recover line numbers reliably with word diff. I am looking at an example where a blank line is added.  There are no words, so there is just a blank line, with no indication of whether it is added or removed.  Is there any way to get the line numbers just be printed on each line, so one doesn't have to try to infer them?
22:10 justan0theruser joined #git
22:12 madduck joined #git
22:12 diogenese joined #git
22:13 SiliconDon joined #git
22:13 ISmithers joined #git
22:14 ISmithers joined #git
22:16 mda1_ joined #git
22:18 zzz joined #git
22:25 SiliconDon joined #git
22:27 WayToDoor joined #git
22:28 rgrinberg joined #git
22:30 clemf joined #git
22:33 Levex joined #git
22:34 Jellyg00se joined #git
22:35 WaReZ joined #git
22:36 thiago joined #git
22:37 SiliconDon joined #git
22:38 SiliconDon joined #git
22:38 Levex joined #git
22:39 LBV_User joined #git
22:40 aidalgol joined #git
22:41 SiliconDon joined #git
22:41 CheckDavid joined #git
22:42 nettoweb joined #git
22:43 nowhereman joined #git
22:43 SiliconDon joined #git
22:45 Levex joined #git
22:46 SiliconDon joined #git
22:51 _sfiguser joined #git
22:52 _sfiguser joined #git
22:52 madduck joined #git
22:53 ubuntu joined #git
22:54 matoro joined #git
22:57 Naan joined #git
22:58 raijin joined #git
22:59 Oatmeal joined #git
23:01 fmeerkoetter joined #git
23:02 raijin joined #git
23:02 SiliconDon joined #git
23:06 Noldorin joined #git
23:09 raijin joined #git
23:09 ertes joined #git
23:11 raijin joined #git
23:13 _Marek_ /#join lfs
23:14 geoid_ joined #git
23:16 Gsham joined #git
23:17 zzz joined #git
23:19 moei joined #git
23:20 Gloomy joined #git
23:20 johnny56 joined #git
23:20 Taikibansei joined #git
23:21 Levex joined #git
23:22 LiftLeft joined #git
23:24 Noldorin joined #git
23:25 DolpheenDream joined #git
23:26 gry joined #git
23:26 gry so i have two branches, and i would like to review commits from the one which is ahead one by one and add these commits to the one which is behind
23:26 gry what are the keywords to search for to find a good tutorial?
23:27 Levex joined #git
23:29 Vampire0 gry, if you want to look at each commit and decide whether you want to copy it over, look at the commits and then use man git cherry-pick
23:29 gitinfo gry: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
23:29 Vampire0 gry, if you want to copy all commits over, but still look at each and probably modify it, you could make an interactive rebase, choosing edit stanza for all lines
23:30 raijin joined #git
23:31 levex_ joined #git
23:31 Sasazuka joined #git
23:31 ubuntu_ joined #git
23:33 pur3eval joined #git
23:34 bernardio joined #git
23:34 Sasazuka joined #git
23:35 gry ok
23:35 BSaboia joined #git
23:36 justanotheruser joined #git
23:36 F0rTh3J3st joined #git
23:37 Raed|Mobile joined #git
23:37 l4v2 joined #git
23:38 fatalhalt joined #git
23:46 gry the cherrypick man page is a bit overwhelming; say, if i am in 'master' and i have a few commits in branch 'vampire', and branch 'vampire' has two fresh commits which are absent in 'master'
23:47 gry how do i cherrypick the first commit from the 'vampire' branch?
23:48 Gravious gry, cherry picking a commit to master is literally just, git checkout master; git cherry-pick <sha of commit you want>
23:48 gry how do i tell it which branch the commit is in?
23:48 Gravious it doesn't matter
23:49 gry or does it take the sha and looks for it in all branches?
23:49 Gravious the sha of a commit uniquely identifies it within the repo
23:50 gry thank you so much for clarifying that, Gravious :-) appreciated
23:50 Gravious no worries :)
23:51 MonsterKiller joined #git
23:51 souther joined #git
23:53 pbrewczynski joined #git
23:54 bernardio joined #git
23:54 bernardio left #git

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