Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-16

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

All times shown according to UTC.

Time Nick Message
00:02 tristanp joined #git
00:03 codezomb joined #git
00:08 Literphor joined #git
00:08 fstd_ joined #git
00:13 HanClinto_ joined #git
00:13 inflames joined #git
00:13 cdown joined #git
00:17 madewokherd joined #git
00:17 HanClinto__ joined #git
00:18 BSAlb joined #git
00:18 BSAlb joined #git
00:19 BSAlb joined #git
00:21 xlegoman joined #git
00:22 mwhooker joined #git
00:23 tristanp joined #git
00:23 drewo joined #git
00:23 erebel55 joined #git
00:24 erebel55 lo
00:25 erebel55 I'm trying to cherry pick a commit and am getting "your local changes to the following files would be overwritten by merge". However, I haven't made any changes to the files it lists. And when I do a git stash it stashes nothing.
00:26 diogenese joined #git
00:28 Rodya_ joined #git
00:29 Literphor joined #git
00:34 PabloR joined #git
00:35 raijin joined #git
00:35 PabloR I setup the editor with git config --global core.editor TextEdit. But when I write git commit in the terminal it comes back: error: cannot run TextEdit: No such file or directory. error: cannot run TextEdit: No such file or directory. How to setup the text editor in Mac?
00:40 durham_ joined #git
00:41 tristanp_ joined #git
00:42 thiago what do you need to type in the terminal to launch that editor?
00:42 drewo joined #git
00:42 PabloR I never really launched the editor from the terminal before
00:43 PabloR thiago I just directly click on the TextEdit on the dock
00:44 EvilPenguin joined #git
00:44 PabloR thiago Should I need a PATH?
00:44 jstimm_ joined #git
00:46 thiago probably not
00:46 thiago just type the full path name to the executable
00:46 thiago and by executable, the actual executable, inside the .app bundle
00:47 nettoweb joined #git
00:47 kbs joined #git
00:47 Darren_ joined #git
00:49 PabloR thiago, not sure I follow. I wrote git config --global core.editor /Applications/TextEdit but still gives me the same issue
00:49 tristanp joined #git
00:50 HanClinto__ joined #git
00:50 bremner well, step 0 is to get it working by typing it in the shell
00:51 PabloR I typed git config --global core.editor /Applications/TextEdit in the terminal
00:51 bremner I mean, if you can't start the editor from the shell, chances of getting git to do it are slim
00:52 Ankhers joined #git
00:54 thiago PabloR: type that in a terminal. Does it launch the editor?
00:54 PabloR bremner I didn't mean I couldn't start it. I just never did it. I read the way to config it to work with git was the way I just did. When I write git config --list the core.editor=/Applications/TextEdit
00:54 thiago if not, it's the wrong command
00:55 thiago and I told you that you need the actual executable path, inside the bundle
00:55 thiago type that
00:56 HanClinto joined #git
00:56 PabloR thiago, I'm kinda new. Not sure what you meant by the actual executable path, inside the bundle. I thought it was what I wrote
00:58 thiago /Applications/TextEdit doesn't exist
00:58 PabloR I'm not sure what to write in the terminal to get TextEdit to start it
00:58 thiago it's actually /Applications/TextEdit.app and it's a directory
00:58 thiago inside it, you'll find the actual executable
00:59 qpdb joined #git
00:59 jtri joined #git
00:59 jtri is there a way to look at all changes (same as git show) but where it keeps scrolling back through commits?
01:00 jtri i'm searching for a piece of code i deleted ealrier today, and not sure which commit its in...
01:00 thiago jtri: git log -p
01:01 jtri great, thanks!
01:02 harish joined #git
01:02 bronson joined #git
01:04 PabloR thiago how can I see the actual executable within TextEdit? In Finder appears like an Application. I can't figure out how to see within the directory
01:04 thiago use the shell
01:04 thiago Finder won't let you go inside the bundle
01:05 ajf- joined #git
01:09 vbsales joined #git
01:09 mingramm_ joined #git
01:10 anuxivm left #git
01:12 HanClinto joined #git
01:13 pks joined #git
01:13 drewo joined #git
01:15 tristanp joined #git
01:17 Literphor joined #git
01:17 Rikairchy joined #git
01:20 romerocesar joined #git
01:20 PabloR thiago It worked. Thanks! Now I got another issue, when I commit: The document “COMMIT_EDITMSG” could not be opened. You don’t have permission. :p
01:22 Guest55 joined #git
01:22 ajf- joined #git
01:23 azbarcea joined #git
01:27 Guest55 joined #git
01:27 drewo joined #git
01:28 thiago what printed that message?
01:28 thiago git or TextEdit?
01:28 danimal2 joined #git
01:31 PabloR thiago it's a separate window. I'll post the image. Just a sec
01:31 PabloR http://imgur.com/a/KyNt5
01:32 PabloR It just popped up
01:32 arescorpio joined #git
01:33 PabloR when I run git commit
01:34 NeverDie Maybe you'll have to give sudo permissions within your directory that contains your git installation.
01:34 NeverDie Or rather, change read/write permissions.
01:34 NeverDie PabloR: Type $ which git
01:35 NeverDie And $ ls -l /path/to/git
01:36 hahuang61 joined #git
01:37 NeverDie After that perhaps $ sudo chown 666 /path/to/git
01:37 NeverDie Although someone else should confirm that probably.
01:37 PabloR which git -> /usr/local/bin/git
01:38 PabloR ls -l /path/to/git -> ls: /path/to/git: No such file or directory
01:38 NeverDie Yeah I didn't mean literally lol.
01:38 NeverDie $ ls -l /usr/local/bin/git
01:39 NeverDie But in any case, try $ chmod -r 666 /usr/local/bin/git
01:40 boombatower joined #git
01:40 romerocesar joined #git
01:41 sargas joined #git
01:46 sanketdg joined #git
01:46 fahadash joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and surveys | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | rerere: the git that keeps on giving
01:50 romerocesar joined #git
01:51 thiago PabloR: you need to contact people who know Apple programs for more information
01:52 thiago we can't help you. Your problem is not Git, it's this editor you've chosen.
01:53 _August_ joined #git
01:54 _August_ I made a shit load of changes to my files and i committed them but when i try to push to the branch i keep getting this error.  Updates were rejected because the tip of your current branch is behind
01:54 _August_ getting on the current branch?
01:54 _August_ how can i go about getting on the current branch?
01:56 HoierM joined #git
01:58 raijin joined #git
01:59 MZAWeb joined #git
02:01 drbean_ joined #git
02:02 _August_ left #git
02:05 phanimahesh joined #git
02:05 Goplat joined #git
02:10 justanotheruser joined #git
02:14 hexagoxel joined #git
02:15 bronson joined #git
02:17 sangy joined #git
02:18 shgysk8zer0 joined #git
02:19 wms3001 joined #git
02:20 PabloR thiago Ok I will. Thanks. At least I learned the TextEdit was a folder and how to get to it :p
02:24 Literphor joined #git
02:26 tristanp joined #git
02:26 zacts joined #git
02:28 Khisanth joined #git
02:30 romerocesar joined #git
02:30 david007 joined #git
02:31 nettoweb joined #git
02:40 drewo joined #git
02:40 d4rklit3 joined #git
02:41 jeffreylevesque joined #git
02:42 hahuang61 joined #git
02:43 wms joined #git
02:44 ash_workz joined #git
02:49 Asiajey joined #git
02:49 Asiajey joined #git
02:50 zacts joined #git
02:54 chachasmooth joined #git
02:56 bronson joined #git
02:57 xall joined #git
03:01 FuzzySockets joined #git
03:03 mingrammer joined #git
03:06 Literphor joined #git
03:08 filter85 joined #git
03:09 tristanp joined #git
03:11 Sasazuka joined #git
03:11 romerocesar joined #git
03:11 nettoweb joined #git
03:13 dreiss joined #git
03:14 drupald joined #git
03:16 dunpeal joined #git
03:20 Literphor joined #git
03:21 shgysk8zer0 joined #git
03:23 drewo joined #git
03:23 k3rn31 joined #git
03:26 treaki_ joined #git
03:31 l4v2 joined #git
03:39 nnyk joined #git
03:39 sea-gull joined #git
03:42 Literphor joined #git
03:43 rgrinberg joined #git
03:43 hahuang61 joined #git
03:43 clemf joined #git
03:44 Jon28_ joined #git
03:45 dmto joined #git
03:53 cd-rum joined #git
03:53 Asiajey_ joined #git
03:53 tristanp joined #git
03:53 FuzzySockets joined #git
03:55 phaleth joined #git
03:58 mingrammer joined #git
03:59 dmto joined #git
04:04 Jon28 joined #git
04:05 Limes_ joined #git
04:05 raijin joined #git
04:05 bronson joined #git
04:06 pioiytr joined #git
04:13 zacts joined #git
04:15 drewo joined #git
04:22 hk238 joined #git
04:27 Darren_ joined #git
04:30 Guest55 joined #git
04:32 SwiftMatt joined #git
04:36 VoidFox joined #git
04:37 e89c8c95a051 joined #git
04:38 Internet13 joined #git
04:39 Cabanossi joined #git
04:39 stevenbenner joined #git
04:40 tristanp joined #git
04:41 jungsubk joined #git
04:41 drewo joined #git
04:42 Literphor joined #git
04:43 d4rklit3 joined #git
04:43 Silenced joined #git
04:44 Silenced joined #git
04:47 k3rn31 joined #git
04:47 a_thakur joined #git
04:51 jeus2 joined #git
04:51 mathewdgardner joined #git
04:52 mingrammer joined #git
04:56 wrouesnel joined #git
04:59 synchronous joined #git
05:01 dmto joined #git
05:05 Internet13 joined #git
05:06 drewo joined #git
05:07 romerocesar joined #git
05:07 bronson joined #git
05:09 ajf- i have a fork of a git repo that is really good but old how would you suggest I update it ?
05:09 ajf- checkout the last time they were the same and try to merge forwards
05:10 fahadash joined #git
05:10 usm4n joined #git
05:13 dunpeal joined #git
05:14 hahuang61 joined #git
05:17 snowkidind joined #git
05:18 zacts joined #git
05:18 mariuscc joined #git
05:18 eizua joined #git
05:18 ajf- 38 and 1700 different commits each, respectively
05:18 drewo joined #git
05:20 selckin just do it (tm)
05:21 thiago do you care about those 30 commits?
05:21 a3Dman joined #git
05:23 tristanp joined #git
05:26 thiago ajf-: still around?
05:26 ajf- yes
05:26 ajf- i want everything else taken up to date but that
05:26 ajf- I just did
05:26 ajf- git pull -s recursive -X theirs <remoterepo or other repo>
05:26 ajf- with pretty good results
05:27 thiago so you ran "git merge"
05:27 thiago and your answer was "yes, I care"
05:27 ajf- I'm on a separate branch anyways
05:27 ajf- test_blabla
05:27 thiago you're on the branch that diverged 30 commits from its upstream
05:28 ajf- everything is there though doesn't this do what I wanted ?
05:28 ajf- and from now on?
05:28 thiago I don't know for sure what you wanted
05:28 ajf- rebase ?
05:28 thiago I'm assuming that you do want those 30 commits
05:28 thiago since you've merged once, you need to keep merging
05:28 ajf- yup
05:28 thiago you can't rebase anymore
05:28 ajf- ahh...nice, ok.
05:28 thiago you can only rebase if you send those 30 commits to your upstream and they merge them
05:29 ajf- branch ahead by 39 commits now
05:29 lordjancso joined #git
05:29 thiago how many times did you merge?
05:29 ajf- I did that command one time
05:30 ajf- all again?
05:31 ajf- mm I'd like to see some diffs
05:32 thiago git pull runs git merge
05:32 thiago it should have created a single merge commit
05:32 thiago btw, you did throw away some changes
05:32 thiago I thought you wanted them
05:33 bronson joined #git
05:33 ajf- I just tested it generally and it worked but yes I want the changes
05:34 ajf- i'm back at develop now the branch of the fork and checked out a new one and trying to get an interactive merge going
05:34 thiago so why did you tell git merge to throw away all your changes when there was a conflict?
05:34 * ajf- doesn't understand vimdiff
05:35 thiago nor do I
05:35 e89c8c95a050 joined #git
05:35 ajf- it's too much for me to handle
05:35 ajf- need interactive mode
05:36 ajf- mm I'd like something that searches the common commit
05:36 pioiytr_ joined #git
05:36 jeus2 joined #git
05:36 ajf- and then threads forwards asking me what to do
05:36 ajf- long shot ?
05:37 thiago no, completely impossible
05:37 thiago that's not how merges work
05:37 ajf- you keep asking, i did merge --theirs because basically "their changes of the files I have not modified" is what I want, generally speaking
05:37 thiago that's not what you did, though
05:38 thiago -X theirs mean "whenever there's a conflict, throw away my changes and use theirs"
05:38 thiago did you mean that?
05:39 ajf- no
05:39 nnyk joined #git
05:39 thiago ok, so throw away your merge
05:39 ajf- i want the opposite, but I don't want to lose the juicy updates
05:39 thiago go back to the commit that you were before you ran git pull
05:39 ajf- I am there
05:39 thiago git status says "30 and 1700 respectively" ?
05:40 synthroid joined #git
05:41 thiago yes or no?
05:41 ajf- mm
05:41 ajf- no
05:41 ajf- because I had done something for that to happen
05:41 ajf- which was setting the origin to track it
05:42 thiago ok, so go back to the commit where everything started
05:42 thiago before you started tinkering with things
05:42 * ajf- travels back to the time he started tinkering with things
05:43 Rodya_ joined #git
05:43 ajf- let me start over really quick
05:44 ajf- I have a fresh clone of the old fork and I am about to add the original repo as another remote
05:44 Shentino joined #git
05:45 thiago ok
05:45 dmj`` joined #git
05:45 leeN joined #git
05:46 thiago simply do: git pull theremote branchname
05:46 thiago (theremote is probably "origin")
05:46 thiago it'll probably have conflicts. Solve them.
05:47 drewo joined #git
05:47 freimatz joined #git
05:48 mingrammer joined #git
05:48 ajf- ensuing chaos
05:48 emPi joined #git
05:49 thiago that's what you get when you allow a branch to fall behind for so long
05:49 thiago the first rule of branching is "have a strategy for upstreaming your changes"
05:50 thiago when you don't upstream, you effectively fork
05:50 ajf- you mean like a git hook ?
05:50 thiago then you're on your own
05:50 thiago no, I mean as a policy
05:50 thiago you make a change, you figure out how to get your upstream to take it
05:50 ajf- well this is a fork
05:50 thiago you convince them to take it
05:50 ajf- so basically
05:50 thiago no, it isn't
05:50 ajf- uh yea
05:50 thiago fork in the original sense, not GitHub's
05:50 ajf- >:[
05:51 ajf- it's a repo, and a fork of it, and the fork is so good I want to make it be up to date with the original
05:51 ajf- okok
05:51 ajf- no policy
05:51 thiago so you're unforking
05:51 thiago now do the work to unfork
05:52 thiago you may try to rebase instead of merge
05:52 thiago but you may have 30 sets of conflicts instead of just one
05:54 tristanp joined #git
05:54 ajf- no it doesn't work either
05:54 ajf- how about https://gist.github.com/katylava/564416 ?
05:55 thiago not even going to read it
05:55 thiago you have two options: git rebase, or git merge
05:55 thiago anything else is outside of your parameters
05:55 thiago you could not merge. Or you could drop your 30 changes.
05:55 ajf- git merge --no-commit --no-ff refactor
05:56 thiago ok, now solve the conflicts
05:57 ajf- brrr
05:58 wms_ joined #git
05:59 cdown joined #git
06:00 wms_ joined #git
06:05 romerocesar joined #git
06:07 OnBrokenWings joined #git
06:08 blackwind_123 joined #git
06:11 cdown joined #git
06:12 cyan__ joined #git
06:14 Chiko joined #git
06:15 ajf- I have a Neat Trick for this
06:15 ajf- type of situations
06:18 johnny56_ joined #git
06:18 mrBen2k2k2k joined #git
06:27 a_thakur joined #git
06:28 jatin30 joined #git
06:30 ajf- http://pastebin.com/z5dcUg9s
06:30 d4rklit3 joined #git
06:31 ajf- said up to date later
06:31 ajf- btw
06:31 tristanp joined #git
06:32 drewo joined #git
06:35 romerocesar joined #git
06:42 mingrammer joined #git
06:44 PioneerAxon joined #git
06:45 romerocesar joined #git
06:45 Sucks joined #git
06:47 drewo joined #git
06:50 jatin30 I want to undo the changes made to a file as it is now tracked and I want it to go back in its orignal state. https://bpaste.net/show/d3d2eaceeb0e in this you can see when I do "git checkout --<filename> it says it is not known to git when infact it is tracking it!
06:51 jatin30 sorry not tracking it! but the file is present in staging index
06:51 jatin30 *working directory
06:51 jatin30 and it tracks that changes are made to that file
06:52 pioiytr__ joined #git
06:52 Fijit joined #git
06:52 stantonk joined #git
06:52 manizzle joined #git
06:53 j416 jatin30: that's because it's untracked. git does not care about changes to it.
06:53 jatin30 how can i undo the changes made to it?
06:53 j416 what do you mean?
06:54 j416 it's not tracked. git does not know what you did to it.
06:54 Rodya_ joined #git
06:55 jatin30 I used vim for the first time and opened that file. when I closed it it said changes were made to that file. I want to undo any changes. any way to do that?
06:55 j416 jatin30: what file?
06:55 romerocesar joined #git
06:56 j416 jatin30: you are asking about the swp file, do you realise this
06:56 j416 jatin30: also, you seem to be in the middle of a conflicted merge
06:57 jatin30 yes
06:57 jatin30 I am fixing that with meld
06:57 j416 jatin30: I don't know what you are trying to do, but !backup and then `git reset --hard` should get you back to some stable state. Also, remove the swp file.
06:57 gitinfo jatin30: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
06:57 j416 jatin30: then, try again
06:57 j416 jatin30: or, git merge --abort
06:58 jatin30 ok thanks
06:58 j416 perhaps is what you need.
06:58 j416 actually you seem to be in middle of cherry-pick or rebase
06:58 j416 see line 6 for help.
07:00 jatin30 yeah I aborted the cherry pick
07:00 circ-user-8eXFL joined #git
07:01 drewo joined #git
07:02 jatin30 but after that and even "git reset HEAD~" I have untracked files https://bpaste.net/show/59391f3388ea
07:04 hahuang65 joined #git
07:04 mehola joined #git
07:05 tristanp joined #git
07:06 romerocesar joined #git
07:06 j416 jatin30: as I said above, git does not care about those files. it does not touch them.
07:06 jatin30 ok
07:06 j416 jatin30: handle them manually. man git-clean can help you remove them if you don't want to do it manually. Or, add them to gitignore.
07:06 gitinfo jatin30: the git-clean manpage is available at http://jk.gs/git-clean.html
07:08 InfoTest joined #git
07:13 flavius joined #git
07:13 ShekharReddy joined #git
07:15 drewo joined #git
07:16 Silenced joined #git
07:16 Silenced joined #git
07:21 zacts joined #git
07:21 elastix joined #git
07:21 zacts joined #git
07:33 drewo joined #git
07:36 mingrammer joined #git
07:36 tristanp joined #git
07:37 irco joined #git
07:38 elastix joined #git
07:38 DieguezZ joined #git
07:42 GavinMagnus joined #git
07:43 GavinMagnus left #git
07:46 romerocesar joined #git
07:50 multi_io joined #git
07:54 d4rklit3 joined #git
07:54 tvw joined #git
07:54 liuzhen joined #git
07:54 zyy joined #git
07:55 Rodya_ joined #git
07:56 mkoskar joined #git
08:03 Cooler1 left #git
08:03 pioiytr__ joined #git
08:06 Sasazuka joined #git
08:06 romerocesar joined #git
08:09 tristanp joined #git
08:09 rossome joined #git
08:09 ynanm joined #git
08:11 MaximusColourum joined #git
08:12 a_thakur joined #git
08:13 Repox joined #git
08:16 dimi1947 joined #git
08:30 mingrammer joined #git
08:31 isbotnetcool joined #git
08:34 drewo joined #git
08:34 MrMojito joined #git
08:37 jimi_sanchez joined #git
08:40 zyy joined #git
08:40 NeonSynth joined #git
08:41 spudowiar joined #git
08:41 zyy joined #git
08:41 zyy joined #git
08:42 tristanp joined #git
08:42 zyy joined #git
08:43 zyy joined #git
08:44 circ-user-8eXFL joined #git
08:46 dmto joined #git
08:46 romerocesar joined #git
08:48 grift joined #git
08:53 apotry joined #git
08:55 Jackneill joined #git
08:56 Rodya_ joined #git
09:00 pioiytr_ joined #git
09:01 drewo joined #git
09:02 lophte joined #git
09:05 Silenced joined #git
09:05 Silenced joined #git
09:05 bronson joined #git
09:06 romerocesar joined #git
09:07 m2n left #git
09:08 toogley joined #git
09:09 a3Dman joined #git
09:11 choki joined #git
09:13 freimatz joined #git
09:13 hahuang65 joined #git
09:13 GenZai joined #git
09:14 D[4]ni joined #git
09:16 tristanp joined #git
09:16 pioiytr_ joined #git
09:17 romerocesar joined #git
09:17 Discovery joined #git
09:17 ncd|leeN joined #git
09:18 drewo joined #git
09:19 satifant joined #git
09:19 IlNominePatre joined #git
09:20 dimi1947 joined #git
09:20 Limes_ joined #git
09:21 phoenixh joined #git
09:27 romerocesar joined #git
09:28 sfan786 joined #git
09:28 tier2villain_ joined #git
09:28 tfnico joined #git
09:29 bttf joined #git
09:29 OnBrokenWings joined #git
09:29 paperziggurat joined #git
09:30 Snopandan joined #git
09:31 a_thakur joined #git
09:32 Snopandan joined #git
09:35 Snopandan joined #git
09:36 phanimahesh joined #git
09:36 pioiytr joined #git
09:40 a_thakur_ joined #git
09:41 Silenced joined #git
09:42 Silenced joined #git
09:43 circ-user-8eXFL joined #git
09:44 _tpavel joined #git
09:46 tristanp joined #git
09:47 mns joined #git
09:48 SimonNa joined #git
09:49 [cust] joined #git
09:51 drewo joined #git
09:53 FunkyAss joined #git
09:55 tamlin joined #git
09:57 tamlin Committing specified files already in the index works as expected with -m, but if I try --interactive with the same files specified git claims it will commit all files in the index. Is that a bug (2.7.4.windows.1) or intentional (seems unlikely)?
09:57 romerocesar joined #git
09:58 Rodya_ joined #git
10:05 jeus2 joined #git
10:08 davisonio joined #git
10:10 nidr0x joined #git
10:11 macivy joined #git
10:13 osse tamlin: do you mean git commit -m message file  versus  git add --interactive ?
10:14 tamlin Not message file, just cmd-line msg.
10:14 hahuang65 joined #git
10:14 apotry joined #git
10:14 osse git-add adds more files
10:14 osse git add file1; git add file2; git commit;  This will commit both files 1 and 2
10:15 drewo joined #git
10:15 tamlin Right. But this is: I have foo, bar and baz in index (i.e. added).
10:15 kam270 joined #git
10:16 osse aha
10:16 tamlin If I do git commit foo -m "foo msg", only foo gets committed (as expected). If I however do git commit foo --interactive, the list claims *all* files in the index will be committed.
10:17 tamlin The reason I want interactive is (obviously) I want a multi-lime msg.
10:17 tamlin osse, Can you repro on a recent build?
10:17 osse tamlin: your first example there is exactly what I asked for :p
10:17 osse I meant -m "message" file
10:18 tamlin Ah! I though you intended "message file".
10:18 osse My guess is --interactive just makes commit run add first
10:19 mingrammer joined #git
10:19 osse and giving both foo and --interactive doesn't sound very useful
10:19 osse ah, sounds like you misunderstood what --interactive does
10:19 tamlin In this case it is. I have a bunch of files in the index, and working my wy way through committing them according to changes made (long story, don't ask).
10:20 osse just run ''git commit'' then. Nothing more, nothing less.
10:20 tristanp joined #git
10:21 k_sze joined #git
10:21 tamlin I just (by habit) press 'q' on the first screen of interactive. Oh man, now I feel like a moron.
10:21 narendraj9 joined #git
10:21 k_sze Is there actually a limitation with git's ability to represent permission bits?
10:21 bremner yes
10:21 osse git commit <whatever here> some/path bypasses the index entirely. so giving some/path AND --interactive should me an error
10:22 bremner k_sze: git only tracks the executable bit
10:22 k_sze I have some .sh scripts that were 644. After doing chmod u+x, git says they are now 755.
10:22 k_sze that's...
10:22 bremner that sounds wrong
10:23 bremner oh, I misread. I guess you did chmod, plus some git operation?
10:23 tamlin osse, Interesting. It's not bypassing the index here. Rather it cherry-picks the files specified (that are in the idex).
10:23 osse tamlin: if you use --interactive, sure
10:23 osse not if you don't
10:23 k_sze no, just chmod u+x, and then git diff
10:24 bremner ok, but what do you see in the file system?
10:24 k_sze 744
10:24 tamlin osse, No, on non-interactive. add foo and bar to the index. Then "git commit foo" commits only foo. Bar remains in index.
10:24 nitin joined #git
10:24 osse exactly
10:24 bremner k_sze: that sounds about right. git just tracks "executable vs. non-executable"
10:25 osse which is why i think git commit foo --interactive should be an error
10:25 osse like git commit -a foo
10:25 k_sze That's sad.
10:26 lohfu joined #git
10:26 drewo joined #git
10:26 tamlin osse, "commt -a foo" indeed seems fishy, and now that you mention it I also think filenames specified with --interactive should result in an error (and a good message stating "You select files interactively using this flag".).
10:27 phanimahesh k_sze: when tracking sourcecode it's not a common requirement to store finegrained access control stuff.
10:27 phanimahesh executable needs special casing because without it life would be difficult
10:28 shinnya joined #git
10:28 tamlin osse, But this brings up another "problem". I do want the editor for the commit message for this specifix (set of) file(s). Is there a flag perhaps I'm unaware of, or is this something not considered?
10:29 osse tamlin: git commit alone launches the editor if you don't specify -m
10:30 tamlin Together with letting me select what files to include? If so - man, I'm feeling like a double-moron right now. :-)
10:30 osse tamlin: no
10:30 osse you have already selected what files to include
10:31 tamlin Ah! So without -m, the commit message editor starts?!
10:31 osse if you have only selected them in your head, do git add --interactively first
10:31 osse yes
10:31 tamlin See, I'm a double-moron either way. :-)
10:31 tamlin osse, Thanks for the help, and putting me on the right track.
10:31 vdv joined #git
10:33 tamlin left #git
10:35 howdoi joined #git
10:37 romerocesar joined #git
10:38 Snopandan joined #git
10:39 p4trix joined #git
10:40 fees joined #git
10:41 k_sze Is there then a way to make git always use upstream's permission bits when merging?
10:41 Silenced_v2 joined #git
10:42 k_sze Because right now I have this repo where I clone it, and I need to chmod u+x some scripts so I can run them. but then git pull always complains when the only difference is the perm bits.
10:44 SirOliver joined #git
10:45 Silenced_v2 joined #git
10:45 narendraj9 joined #git
10:45 a_thakur joined #git
10:46 RedShift joined #git
10:49 bremner one solution would be to not run from the git repo, but use some kind of install script.
10:49 netj joined #git
10:51 leeN joined #git
10:53 tristanp joined #git
10:55 cbreak k_sze: commit the executability and push it
10:55 k_sze cbreak: but we also generally don't want it to be go+x
10:56 cbreak k_sze: then why do you want to execute it?
10:56 k_sze I want to execute it as a user.
10:56 quetz joined #git
10:57 cbreak so commit that
10:57 cbreak and set the right umask in git
10:57 NwS Heya guys, a quick question. Someone did a few changes in main git branch but hasn't committed them yet is it possible to roll back to previous ones?
10:58 rchavik joined #git
10:58 drewo joined #git
10:59 Rodya_ joined #git
10:59 rudi_s NwS: git checkout -- path/to/file will remove changes from the working tree and restore them to the version in the current branch. Those changes are lost obviously.
10:59 NwS rudi_s, tyvm!
10:59 rudi_s (Assuming with main git branch you mean the working tree .. because you can't do changes on a branch unless you commit them.)
11:05 mycyber joined #git
11:06 e89c8c95a050 joined #git
11:07 bronson joined #git
11:08 romerocesar joined #git
11:10 UncleCJ joined #git
11:12 lordjancso joined #git
11:13 robotroll joined #git
11:13 narendraj9 joined #git
11:13 mingrammer joined #git
11:16 ojdo joined #git
11:17 Silenced joined #git
11:17 Silenced joined #git
11:17 mikecmpbll joined #git
11:18 romerocesar joined #git
11:27 troulouliou_div2 joined #git
11:30 drewo joined #git
11:30 tristanp joined #git
11:31 mehola joined #git
11:31 liuzhen joined #git
11:31 phanimahesh joined #git
11:40 mycyber joined #git
11:42 MaximusColourum joined #git
11:45 chid joined #git
11:45 chid_ joined #git
11:49 Silenced joined #git
11:51 theskillwithin joined #git
11:51 Silenced joined #git
11:52 drewo joined #git
11:53 cqi joined #git
11:56 GT4066 joined #git
11:59 Rodya_ joined #git
12:00 ChrisWarrick joined #git
12:00 ChrisWarrick Can I convert an existing directory that is a clone of a git repo to a git submodule?
12:01 davisonio joined #git
12:01 Silenced joined #git
12:01 dreamseeker_ joined #git
12:03 tomog999 joined #git
12:04 Vinnie_win_a joined #git
12:04 cbreak ChrisWarrick: sure
12:04 cbreak git submodule add
12:04 tristanp joined #git
12:07 Noldorin joined #git
12:07 mingrammer joined #git
12:09 romerocesar joined #git
12:13 ChrisWarrick how do I clone from a repo that lives on my ssh server which uses a non-standard ssh port?
12:13 ChrisWarrick (I’d normally use .ssh/config, but that’s a chicken-and-egg problem here)
12:14 jhass git help clone -> GIT URLS
12:14 cbreak ChrisWarrick: port in the url
12:14 cbreak ssh://foobar@server:port/path
12:14 flaguy48 left #git
12:15 cyan__ joined #git
12:15 ahmed_elgabri joined #git
12:18 sdothum joined #git
12:19 romerocesar joined #git
12:20 Kinder-Pingvi joined #git
12:22 SirOliver joined #git
12:25 usm4n joined #git
12:25 davisonio joined #git
12:26 MaximusColourum joined #git
12:27 dmto joined #git
12:28 Snopanda1 joined #git
12:28 l4v2 joined #git
12:29 flaguy48 joined #git
12:30 white_gecko joined #git
12:32 ArchNoob joined #git
12:33 mehola joined #git
12:36 tristanp joined #git
12:41 drewo joined #git
12:41 cyan__ joined #git
12:45 usm4n joined #git
12:48 romerocesar joined #git
12:50 erebel55 joined #git
12:55 erebel55 does anyone know why I get the following when I try and pull a pull request? http://hastebin.com/rajajadasu.txt
12:55 erebel55 I have not made any local changes
12:55 erebel55 and when I do a stash it stashes nothing
12:57 ojacobson You have local changes, whether you believe you do or not. That's what that message is telling you. `git status` should illuminate; they may be local changes of the "I have untracked files" variety.
12:58 erebel55 I just cloned the repository. I don't see how I could have local changes
12:58 ojacobson *shrug* build process may generate them, or there could be .gitattributes filters, or … any of a number of things
13:00 Rodya_ joined #git
13:01 bremner presumably git diff [--cached] would also be illuminating
13:02 erebel55 I'm running git status right now. It's taking a long time :/
13:02 Silenced joined #git
13:02 NeonSynth_ joined #git
13:03 bremner is your repo enormous? or on a network file system?
13:05 erebel55 it's pretty enourmous
13:05 erebel55 it just finished
13:05 erebel55 and spit out like every file as modified
13:05 erebel55 which makes no sense
13:05 usm4n joined #git
13:05 bremner line endings?
13:05 Samual joined #git
13:05 erebel55 I haven't even opened any of these files. The list was crazy long
13:05 erebel55 all I did was clone the repo
13:06 bremner !line endings
13:06 gitinfo [!crlf] to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/
13:07 tristanp joined #git
13:07 bremner well, you can check with diff to see what the changes are, that would be a first step.
13:07 HoierM joined #git
13:08 erebel55 okay, I will try to figure that out
13:09 erebel55 yeah I think it's line endings
13:09 erebel55 it's saying the diff is ^M at the end of hte lines
13:09 romerocesar joined #git
13:09 bremner yup. so maybe the link I pasted above can help.
13:10 bremner I've thankfully avoided line ending nonsense so far, myself.
13:10 erebel55 ahh it must be because I'm using cygwin's version of git
13:11 ChrisWarrick How can I add a git repo to a git repo’s working tree without using submodules?
13:12 NeverDie joined #git
13:15 jeus2 joined #git
13:16 kanyeezy joined #git
13:16 MaximusColourum joined #git
13:17 erebel55 bremner, thank you!
13:18 osse joined #git
13:18 jeus2 joined #git
13:22 happy-dude joined #git
13:24 chachasmooth joined #git
13:25 nwkj86 joined #git
13:25 osse joined #git
13:30 todd_dsm joined #git
13:31 osse joined #git
13:31 antranigv joined #git
13:34 mehola joined #git
13:34 chachasmooth joined #git
13:35 RedShift joined #git
13:35 drewo joined #git
13:36 usm4n joined #git
13:36 cyan__ joined #git
13:37 ome joined #git
13:38 ShekharReddy joined #git
13:40 Silenced joined #git
13:40 drewo joined #git
13:41 tristanp joined #git
13:42 sanketdg joined #git
13:43 cqi joined #git
13:45 cqi joined #git
13:48 nwkj86 joined #git
13:48 circ-user-91UQh joined #git
13:50 chachasmooth joined #git
13:52 zivester joined #git
13:53 mrBen2k2k2k joined #git
13:56 mingrammer joined #git
13:57 pioiytr joined #git
13:57 Orbitrix joined #git
13:58 Orbitrix joined #git
14:00 Asiajey joined #git
14:00 Ediz joined #git
14:01 MZAWeb joined #git
14:03 harish_ joined #git
14:08 dangerousdave joined #git
14:11 rgrinberg joined #git
14:11 davisonio joined #git
14:13 tristanp joined #git
14:14 fmcgeough joined #git
14:15 D-Boy joined #git
14:16 chid joined #git
14:16 chid_ joined #git
14:17 nettoweb joined #git
14:19 hahuang65 joined #git
14:20 nnyk_ joined #git
14:23 davisonio joined #git
14:26 macivy joined #git
14:28 fahadash joined #git
14:30 snowkidind joined #git
14:32 Darren_ joined #git
14:32 Orbitrix joined #git
14:35 ahmed_elgabri joined #git
14:35 mehola joined #git
14:35 LiohAu joined #git
14:42 flupke joined #git
14:43 sfan786 joined #git
14:44 iamdevnul joined #git
14:44 jost joined #git
14:45 tristanp joined #git
14:45 macivy left #git
14:46 dreiss joined #git
14:48 reim joined #git
14:50 mingrammer joined #git
14:51 ahmedelgabri joined #git
14:52 cuebix-wk joined #git
14:53 Lauven joined #git
14:54 Jackneill_ joined #git
14:55 rainbyte joined #git
15:00 CheckDavid joined #git
15:02 Orbitrix joined #git
15:02 alexruf left #git
15:06 zaherdirkey joined #git
15:06 zaherdirkey i have a branch1, i want to pull it into my master, is that safe?
15:08 osse zaherdirkey: sure, why not
15:08 osse git checkout master; git merge branch11
15:09 bronson joined #git
15:09 zaherdirkey i dont want to use merge, i want to keet commits as it
15:09 zaherdirkey similar to accept pull requests from others
15:09 osse then merge is what you want
15:09 zaherdirkey like this : git pull original branch1
15:09 osse pull does a merge
15:10 romerocesar joined #git
15:10 zaherdirkey merge as i remember add all changes (commits in the branch) in one commit to master
15:11 osse that's wrong
15:11 osse sounds like you're thinking of svn :p
15:12 zaherdirkey yah i changed to git before years, but still like metge commits as it, but rebase here not usfull
15:14 zaherdirkey i tested it pull, now, can the other dev continue with the branch1 then i will remarge again in the future, or he need to rebase?
15:19 tristanp joined #git
15:20 Silenced joined #git
15:20 hahuang65 joined #git
15:20 zaherdirkey no, i am wrong, merge doing same as pull
15:22 MaximusColourum joined #git
15:22 shgysk8zer0 joined #git
15:24 elastix joined #git
15:26 rainbyte joined #git
15:26 Guest41 joined #git
15:29 kbs joined #git
15:35 todd_dsm joined #git
15:36 mehola joined #git
15:37 Jackneill_ joined #git
15:39 FunkyAss joined #git
15:40 madewokherd joined #git
15:40 Asiajey joined #git
15:40 Asiajey joined #git
15:41 drewo joined #git
15:47 tristanp joined #git
15:49 The_Phoenix joined #git
15:50 The_Phoenix joined #git
15:52 Guest41_ joined #git
15:53 rainbyte joined #git
15:53 nnyk_ joined #git
15:54 InfoTest joined #git
15:54 NeverDie joined #git
15:55 SteffanW joined #git
15:56 YesMan joined #git
15:56 YesMan hello
15:57 ynanm joined #git
15:58 YesMan I cannot git fetch my github repository because of firewall rules, however port 80, 443 and  9418 are open
15:58 YesMan turning off my firewall allow me to fetch again
16:04 mariuscc joined #git
16:04 ChrisWarrick keep it turned off
16:04 ChrisWarrick as for real advice, if you’re going over ssh, you might want to open 22 too — and an outgoing connection firewall is worthless
16:07 Literphor joined #git
16:07 azbarcea joined #git
16:08 YesMan I can't it is the firewall of my home server. ssh, http & https are working just fine, I can wget anything and my nginx is working as expected, the only thing not working is git. There is a required rule missing and I can't find what it is
16:08 liquidjamm joined #git
16:09 drewo joined #git
16:11 nicoulaj joined #git
16:11 netcarver joined #git
16:11 netj joined #git
16:12 thiago joined #git
16:16 catag87 joined #git
16:16 The_Phoenix joined #git
16:17 The_Phoenix joined #git
16:18 YesMan The error I'm getting is fatal: unable to access 'https://github.com/nextcloud/server.git/': Could not resolve host: github.com
16:18 The_Phoenix joined #git
16:18 tristanp joined #git
16:19 The_Phoenix joined #git
16:20 bremner can you hit it with a web browser?
16:20 Orbitrix joined #git
16:20 bremner and is this Windows?
16:20 The_Phoenix joined #git
16:21 hahuang65 joined #git
16:21 The_Phoenix joined #git
16:26 JanC_ joined #git
16:28 irco joined #git
16:29 Meow_J joined #git
16:29 MZAWeb joined #git
16:32 thiago YesMan: works here. Your DNS resolver is broken.
16:33 rainbyte joined #git
16:34 white_gecko In which cases is it not enought for a three-way-merge to take the latest common ancestor of two commits and do a recursive merge?
16:36 mehola joined #git
16:37 nnyk joined #git
16:37 wspider if I ignore a folder, everytime that somebody make a push and I merge it, will the folder dissapear?
16:37 wspider I mean, that's what just happened to me xd
16:38 thiago white_gecko: when it's not a merge of two parents, but more
16:38 mingrammer joined #git
16:39 ajf- joined #git
16:39 thiago wspider: you can't ignore something that is part of the repository
16:41 wspider thiago: ok.. it's the node_modules folder in nodejs, I will try to put it outside of the repo
16:41 wspider because it's different for every pc
16:41 davisonio joined #git
16:41 drewo joined #git
16:43 D[4]ni joined #git
16:43 thiago wspider: then don't git add anything in it
16:44 thiago and don't let your contributors do it either
16:44 thiago you can ignore it. Just don't git add it.
16:46 tristanp joined #git
16:47 wspider ok
16:48 lordjancso joined #git
16:55 dmto joined #git
16:56 unbalancedparen joined #git
16:58 SirRetnuh joined #git
16:58 SirRetnuh left #git
16:59 McNozes joined #git
16:59 The_Phoenix joined #git
17:03 ajf- joined #git
17:09 port0 joined #git
17:09 irath joined #git
17:09 irath hi
17:09 gitinfo irath: 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.
17:10 ChrisWarrick left #git
17:10 irath first time using git.. on windows. i follow these steps https://help.github.com/articles/adding-an-exis​ting-project-to-github-using-the-command-line/ but when i get to git push it says permission denied
17:10 irath it never gives me an opportunity to enter my credentials
17:10 Asiajey joined #git
17:10 irath im trying to push my local repository to my github url
17:11 moritz irath: are you using a https or a git@... URL?
17:11 Literphor joined #git
17:11 irath https
17:11 moritz then I have no idea :(
17:12 irath bleh.. i think i might have messed up and made a credential store somewhere on my computer
17:12 irath and now it's trying to use that?
17:12 irath that'd be my best guess.. i dont know i was just trying random things to get it working
17:12 tristanp joined #git
17:15 UncleCJ joined #git
17:16 irath ahah!
17:16 irath git config --system --unset credential.helper
17:16 irath that fixed it
17:18 vishal irath: I'd just use ssh and key based auth instead of https
17:18 vishal http://kylecordes.com/2008/git-windows-go
17:18 irath yeah i know ill look in to all that later
17:18 irath just trying to get it working for now
17:18 vishal :)
17:19 ShapeShifter499 joined #git
17:19 tristanp joined #git
17:20 irath finally ! first git push success
17:22 irath left #git
17:22 hahuang65 joined #git
17:22 bremner !next
17:22 gitinfo Another satisfied customer. NEXT!
17:25 cyphase joined #git
17:27 e89c8c95a050 joined #git
17:29 pioiytr joined #git
17:31 nnyk joined #git
17:33 mingrammer joined #git
17:34 rainbyte joined #git
17:34 YesMan thiago: Everything works, its only a firewall issue. dns resolving is done on the github end
17:35 drewo joined #git
17:35 PioneerAxon joined #git
17:35 porto joined #git
17:36 vsanc joined #git
17:36 spudowiar joined #git
17:37 mehola joined #git
17:38 thiago YesMan: no, DNS resolving is on your end
17:41 romerocesar joined #git
17:43 spudowiar joined #git
17:43 MZAWeb joined #git
17:44 spudowiar joined #git
17:44 D[4]ni joined #git
17:45 nettoweb joined #git
17:46 devxom joined #git
17:46 spudowiar joined #git
17:47 python903 joined #git
17:48 spudowiar joined #git
17:50 YesMan thiago: That was it, just unabled port 53 and it works, thanks
17:51 raijin joined #git
17:51 tristanp joined #git
17:53 zacts joined #git
17:54 apotry joined #git
17:56 romerocesar_ joined #git
17:56 macivy joined #git
17:56 spudowiar joined #git
17:57 Noldorin joined #git
17:57 trewe joined #git
17:58 spudowiar joined #git
18:03 cdown joined #git
18:06 espindola joined #git
18:09 drewo joined #git
18:10 mkoskar joined #git
18:12 Rodya_ joined #git
18:13 jost joined #git
18:14 armyriad joined #git
18:14 circ-user-91UQh joined #git
18:16 davisonio joined #git
18:23 hahuang65 joined #git
18:23 GenZai joined #git
18:25 Literphor joined #git
18:27 pioiytr joined #git
18:27 piling joined #git
18:29 tristanp joined #git
18:30 texinwien joined #git
18:31 nilg joined #git
18:34 white_gecko joined #git
18:36 white_gecko thiago: thanks :-)
18:38 ag4ve_ joined #git
18:41 xall joined #git
18:44 bongjovi joined #git
18:45 D[4]ni joined #git
18:45 elem joined #git
18:49 cdown_ joined #git
18:52 zaherdirkey joined #git
18:53 Peng_ joined #git
18:53 Peng_ joined #git
18:54 RustyShackleford joined #git
18:54 zacts joined #git
18:54 RustyShackleford I've never gotten the hang of merging conflicts
18:54 RustyShackleford which tool do you use?
18:54 jottr joined #git
18:55 bremner I use emerge, but I've used kdiff3 in the past
18:56 Magus joined #git
18:57 zeroed joined #git
18:57 zeroed joined #git
18:57 Sadeukko joined #git
18:57 Shakeel__ joined #git
18:58 Magus left #git
18:58 RustyShackleford on my work computer, there was one set up out of the box
18:59 RustyShackleford is there one that ships by default with the windows installer?
18:59 Magus420 joined #git
19:00 rainbyte joined #git
19:00 unbalancedparen joined #git
19:01 shgysk8zer0 joined #git
19:03 romerocesar joined #git
19:05 spudowiar joined #git
19:06 justanotheruser joined #git
19:06 tristanp joined #git
19:08 scorphus joined #git
19:09 rgrinberg joined #git
19:10 NwS joined #git
19:11 codezomb joined #git
19:12 playfullyExist joined #git
19:13 Peng_ joined #git
19:13 MZAWeb joined #git
19:15 cdg joined #git
19:15 playfullyExist joined #git
19:15 cyan__ joined #git
19:20 qsx i like p4merge
19:21 mingrammer joined #git
19:24 hahuang65 joined #git
19:27 pioiytr joined #git
19:28 pioiytr joined #git
19:28 romerocesar joined #git
19:33 osse RustyShackleford: no
19:33 osse RustyShackleford: you don't have to use any, really. it is possible to resolve conflicts by opening the file directly and fixing it up
19:34 Rodya_ joined #git
19:35 mehola joined #git
19:39 RustyShackleford I checked out my feature branch, then "git rebase master"
19:39 phanimah1sh joined #git
19:40 Bpbj joined #git
19:41 zaherdirkey after merge branch to master, do i need to rebase my branch to the master?
19:41 RustyShackleford now my branch is 37 commits ahead of master even though my feature branch consists of 18 commits
19:41 RustyShackleford does rebasing always do this?
19:42 osse no
19:42 osse sounds like someone force-pushed
19:43 osse RustyShackleford: if you do git log master..mybranch, is your commits the 18 top ones?
19:43 RustyShackleford yes
19:43 osse RustyShackleford: then you can do:  git rebase --onto=master mybranch~18
19:44 Goplat joined #git
19:44 tristanp joined #git
19:45 RustyShackleford nobody force pushed
19:45 RustyShackleford although I just pushed this to remote
19:46 D[4]ni joined #git
19:47 RustyShackleford so I think my repo is fine, nothing is broken. But the bitbucket interface is a little wierd
19:49 fahadash joined #git
19:49 osse Git thought your branch had 37 commits that were not on master, so it rebased those
19:49 osse not sure how that came to be
19:49 robotroll joined #git
19:51 Jon28 joined #git
19:51 Literphor joined #git
19:51 raijin joined #git
19:51 RustyShackleford I shouldn't let my feature branch diverge from master for so long
19:51 RustyShackleford whats the difference between git rebase master and git rebase --onto=master
19:52 osse RustyShackleford: git rebase master rebases the current branch on master. that means it takes all commits on the current branch that are not on master and puts them on top
19:53 osse RustyShackleford: git rebase --onto=master otherbranch rebase the current branch on master, but it just takes the commits that are not on otherbranch
19:53 osse it's basically a transplant
19:53 mischat joined #git
19:53 osse RustyShackleford: https://github.com/Osse/git-stu​ff/blob/master/rebase-onto.txt
19:54 israelzuniga joined #git
19:55 RustyShackleford thanks for the diagram
19:55 zaherdirkey joined #git
19:55 pioiytr joined #git
19:56 RustyShackleford in most cases I think git rebase master is what I want
19:56 osse yes
19:56 RustyShackleford still not understanding where all these extra commits came from
19:57 osse git log --graph --oneline --decorate master master@{1} mybranch mybranch@{1} might help
19:57 osse will show a graph of the current branches, and what they where before
19:57 tristanp joined #git
19:58 romerocesar joined #git
19:58 RustyShackleford gitk is showing each of my commits twice
19:58 RustyShackleford master -> feature branch -> feature branch
19:59 Gamecubic joined #git
19:59 clemf joined #git
20:01 osse same branch twice?
20:01 jimi_ joined #git
20:02 osse same name?!
20:03 Sucks joined #git
20:03 RustyShackleford https://imgur.com/kLNrd1M
20:03 RustyShackleford or maybe thats just the merge commit
20:04 osse did you run merge or pull willy nilly ?
20:04 Asiajey joined #git
20:04 RustyShackleford perhaps
20:05 osse looks like you rebased, then merged
20:05 osse since everything is listed twice
20:05 RustyShackleford I messed something up while fixed the conflicts
20:05 RustyShackleford sooo... possible to fix this?
20:06 ag4ve_ joined #git
20:06 osse sure
20:06 p0lz joined #git
20:06 osse ahh
20:06 ekinmur joined #git
20:06 osse you did the rebase --onto thing I suggested, then did git pull right?
20:06 osse that's my gyess
20:07 osse anyway: git checkout makepayment; git reset --hard HEAD~1; git push -f origin makepayment
20:08 p0lz Hello. New to git. Assume I've 1 repo which has 2 files. Is it correct to visualize all commits in that repo as commits made sequentially to those files?
20:09 osse what do you mean?
20:09 moritz p0lz: if there were branches and merges, a sequential visualization can lose information
20:10 p0lz moritz, osse  : I am trying to get a high-level overview of how it can be visualized. Like if you change both files in order and do git log, you'll see commits for repo in reverse order.
20:10 RustyShackleford osse, I did a git rebase master
20:10 RustyShackleford and then fixed the merge conflicts, pushed to remote
20:11 p0lz moritz: true, but anyways, the branches would be merged in master folder, right?
20:11 RustyShackleford saw this on bitbucket and game here for help haha
20:12 kus joined #git
20:16 mingrammer joined #git
20:16 romerocesar joined #git
20:20 xall_ joined #git
20:21 blackwind_123 joined #git
20:22 Kicer86 joined #git
20:25 hahuang65 joined #git
20:25 naf joined #git
20:25 naf hi
20:25 gitinfo naf: 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.
20:25 RustyShackleford I think I can just revert that last commit (the merge)
20:26 RustyShackleford and my branch will be fixed
20:26 naf is there a way to copy one git repository to the master repository of another one, while maintaining all the previous commits? and specifically, i need to do so from one private repository to another private repository.
20:28 naf ah i think i figured it out
20:28 naf https://help.github.com/artic​les/duplicating-a-repository/
20:28 swati_27 joined #git
20:29 tango_ joined #git
20:29 swati_27 Hi. what is syntax to use multiple keywords with git commit ?
20:29 nnyk joined #git
20:29 moritz swati_27: what do you mean by "keywords"?
20:30 yqt joined #git
20:30 swati_27 "BUG:<bugnumber>"
20:30 swati_27 for ex, to close this bug entry
20:30 swati_27 such keywords
20:31 osse swati_27: depends entirely on who/what parses the message. Nothing to do with Git itself
20:31 osse RustyShackleford: that way will still keep the stuff doubled in history. My suggestion fixes that too.
20:32 swati_27 Take a look please.
20:32 johnmilton joined #git
20:32 moritz swati_27: the commit message is just text
20:32 swati_27 https://www.irccloud.com/pastebin/Oi1boLaz/
20:32 RustyShackleford osse, oh I did not see your message
20:32 moritz swati_27: it needs to be par tof the commit message
20:32 osse RustyShackleford: I think I get what happened now: git status did not makepayment was 37 commits ahead of master; it said it was 37 commits ahead of origin/makepayment.
20:32 moritz swati_27: so add the BUG:... thingies inside the quotes
20:32 drewo joined #git
20:33 swati_27 moritz: okay. I'll try
20:33 RustyShackleford osse, I goofed and did a merge after a rebase
20:33 RustyShackleford is I believe what happened
20:34 swati_27 that included it in git message
20:34 swati_27 it worked wrong
20:35 RustyShackleford osse, beautiful
20:36 RustyShackleford force push can be dangerous, yeah?
20:37 RustyShackleford how do you make sure you don't completely wreck your repo?
20:39 ojacobson --force-with-lease will ensure you can undo the force push if you screw it up, at least in the short term
20:39 sctskw joined #git
20:39 ojacobson (as it guarantees that you have the original objects locally, and can force-push them back)
20:39 RustyShackleford good to know
20:39 Arban joined #git
20:40 RustyShackleford git is awesome. I've used git for years with my personal projects, only recently using it in a team setting
20:40 ojacobson other than that, having a very clear mental model of Git helps
20:40 ojacobson git will not help you manage the semantics of your actions, so you gotta do that in your head
20:40 RustyShackleford I can't believe I never learned all this stuff about branching and merging
20:43 davisonio joined #git
20:44 boombatower joined #git
20:44 FuzzySockets joined #git
20:45 swati_27 left #git
20:46 apotry joined #git
20:48 b_rare joined #git
20:48 D[4]ni joined #git
20:48 toogley i have made two local commits (i.e. i haven't pushed them yet) A and B.
20:49 toogley I've made some commits after and between the two Can i  somehow just delete them?
20:50 Bombe toogley, sure, !rebase takes care of that.
20:50 gitinfo toogley: 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
20:51 Bombe toogley, oh, !interactive_rebase is what I meant.
20:51 gitinfo toogley: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
20:51 toogley Bombe: aah, right. i forgot that rebase can just delete commits. thanks
20:54 drewo joined #git
20:55 oomemusss joined #git
20:55 zacts joined #git
20:56 nilg joined #git
20:57 shgysk8zer0 joined #git
21:01 _August_ joined #git
21:07 Literphor joined #git
21:10 mingrammer joined #git
21:10 cdown_ joined #git
21:11 SonicVaan__ joined #git
21:13 smemsh joined #git
21:13 johnmilton joined #git
21:14 dunk joined #git
21:15 DarkMukke joined #git
21:15 raijin joined #git
21:16 smemsh hello, i have a "git log" entry which is a blank comment.  diff is blank.  in reflog it says "HEAD@{35}: reset: moving to @^" for that commit hash.  i did do a reset --hard to abort changes i made to a file.  but now this mysterious entry.  how to get rid of it?
21:17 Fissure joined #git
21:17 milki smemsh: !undo
21:17 gitinfo smemsh: [!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!
21:18 smemsh milki: i don't need to undo anything.  it's completely fine except for this strange log entry.  HEAD is where I want it
21:18 romerocesar joined #git
21:19 smemsh milki: the commit does not show up anywhere in the list generated by "git rebase -i --root" either
21:19 basiclaser joined #git
21:19 smemsh i don't understand how the log entry could be blank, no comment or diff.  how can you commit nothing?
21:19 p0lz hello. If I've 2 commits which I do locally and then do git push origin master, how can I use API to find that these 2 commits happened together?
21:20 dmto joined #git
21:22 muelli joined #git
21:24 milki smemsh: git commit --allow-empty -m '' can do that
21:24 smemsh milki: an empty *diff* ?
21:24 milki smemsh: i believe you want to follow the steps to delete a commit
21:25 smemsh milki: that's empty message
21:25 milki smemsh: --allow-empty
21:25 smemsh milki: oh right there is also --allow-empty-message
21:25 smemsh milki: anyways i didn't do that
21:25 kbs joined #git
21:25 Bombe p0lz, what does “happen together” mean?
21:25 milki p0lz: what do you mean by api?
21:26 hahuang65 joined #git
21:26 milki smemsh: sure
21:26 milki smemsh: theres more than one way to do things
21:26 zacts joined #git
21:26 p0lz Bombe: Basically I want to group together the commits between 2 git push origin master commands
21:26 smemsh the commit is shown as the very first one in git log too (even before the initial commit), but has a date of only a couple hours ago when i did the git reset
21:26 p0lz milki: Using github API to keep track of repo
21:26 Bombe p0lz, and what does “group together” mean?
21:26 smemsh and why isn't it in rebase -i --root ?
21:26 smemsh it's like a ghost commit or something
21:27 Bombe p0lz, basically, unless you somehow record the commits that are pushed you don’t have the information for that.
21:27 milki p0lz: #github would be more appropriate for asking about github api
21:27 p0lz Bombe: For e.g I do 1 commit and git push, then I do 2 commits and then do git push. I want to know if there's a way by which I can find out that 2 commits were done in last git push
21:28 p0lz okay ty milki
21:28 milki with git, you could examine the reflog for the remote tracking branch
21:28 Vinnie_win joined #git
21:29 tristanp joined #git
21:29 stantonk joined #git
21:30 p0lz kinda new to git so don't know advanced stuff but I'll take a look
21:30 Orbitrix joined #git
21:30 vuoto joined #git
21:31 p0lz the git log of a repo is sequential ordering of commits to the files within the repo - is that understanding correct?
21:31 pioiytr joined #git
21:33 BrunoSaboia joined #git
21:34 tristanp joined #git
21:37 usm4n joined #git
21:37 gklochkov joined #git
21:39 usm4n joined #git
21:40 smemsh milki: the instructions for removing a commit says to find the one before.  this one is shown as the very first commit.  so i cannot make a branch from before it
21:40 cdown_ joined #git
21:40 milki smemsh: you could try adding --root to your rebase command
21:41 smemsh smemsh: i said twice that rebase -i --root does *not* show the empty commit
21:43 smemsh i don't understand where this empty commit comes from. i think my git database is corrupted somehow
21:45 usm4n left #git
21:45 smemsh i just tried checking out the ghost commit and doing rebase -i --root.  it just says "noop"
21:45 Eugene I doubt that you have a corrupted git repo; you would know that if you did
21:45 nettoweb joined #git
21:47 smemsh i think because it *is* the root.  but how can it be? there are some 35 commits made before it
21:48 smemsh it is shown as the first commit in git log (on master branch).  but it is totally empty.  i cannot get rid of it
21:48 Eugene !lol
21:48 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
21:48 Eugene Did you accidentally create an !orphan ?
21:48 gitinfo To create an orphaned branch(unrelated to existing history): `git checkout --orphan newbranchname`. This will leave your index/worktree as-is(use `rm .git/index; git clean -dfx` to delete EVERYTHING). If you get 'error: unknown option `orphan`' see !orphan_old. For an empty/null commit see !orphan_null.
21:49 Rolybrau joined #git
21:49 D[4]ni joined #git
21:49 smemsh Eugene: if it was an orphan branch, why does it show in "git log" for master?
21:50 Eugene I have no idea; I don't have a copy of your history to examine ;-)
21:50 Eugene !transcript
21:50 gitinfo Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
21:50 smemsh Eugene: well, i'm saying, it's not an orphan branch
21:50 Eugene Pastebin the lol output ^
21:51 smemsh haha vomit bin
21:51 jks3 joined #git
21:51 smemsh that's creative
21:52 Eugene It took me years to find a good domain name for pastes
21:53 Eugene No PMs, please
21:53 Atrumx joined #git
21:54 smemsh alright well nevermind.  thanks
21:54 Eugene I'll still take a lok
21:54 Eugene But no PMs ;-)
21:55 smemsh it is 781e241
21:55 drewo joined #git
21:57 Eugene That looks to be your initial first-commit, with an empty commit message
21:57 Eugene d47ec8(the first with anything in it) lists 781e241 as a parent
21:58 Eugene Eg, `git rev-parse d47ec8^` yields 781e241
21:58 aidalgol joined #git
21:59 romerocesar joined #git
21:59 Eugene A little bit interested in how you got a null commit message(`git commit` won't allow that without special flags), but there's nothing else weird to me
21:59 ArchNoob joined #git
21:59 cyan__ joined #git
22:00 Hozy joined #git
22:00 smemsh Eugene: that wasn't the first commit at all.  i never commit empty and it wasn't until i changed a commit message using rebase -i and then after did a reset --hard to remove a file.  then that entry appeared.  d47ec8a is the "real" initial commit.  look at the date on 781e241, it is much later than d47ec8a
22:01 Eugene It sounds like something went horribly funky during the rebase
22:01 smemsh Eugene: reflog -> http://pastebin.com/U23zmGD4
22:01 Eugene Without the original history I couldn't tell you what
22:02 Eugene 781e241 HEAD@{35}: reset: moving to @^
22:02 Eugene I suspect that this is your problem ;-)
22:04 joki joined #git
22:05 johnmilton joined #git
22:05 smemsh Eugene: all i did during the rebase was change one single line to reword, which i did, and it completed without error.  i think the very next thing i did was reset --hard @^ after i made some changes i didn't like
22:06 qasaur joined #git
22:09 smemsh Eugene: i cannot figure out how to remove it... it's just extraneous but shows up in the log.  but why does it not show in git rebase -i --root ? doesn't that show the entire chain of commits to the root? how can it differ from "git log" ? rebase has 34 lines, the log has 35 lines
22:10 SporkWitch3 joined #git
22:10 Eugene I believe --root  only shows "up to the root". Since that is the root you can't rebase out of it
22:10 l0rdPE joined #git
22:11 smemsh Eugene: ah, ok, because it is the root commit itself, that's why it shows "noop" if i check it out and try to rebase it.
22:11 Eugene Yup
22:12 Eugene Try: `git checkout d47ec8a; git checkout --orphan newhistory; git commit -C d47ec8a; git checkout b79fea6; git rebase --onto newhistory`
22:14 smemsh so i am checking out a new orphan and writing all history after the first commit onto the empty orphan branch?
22:14 Eugene Yup
22:16 spudowiar joined #git
22:18 snowkidind joined #git
22:18 smemsh Eugene: the rebsae does not work because it requires me to be on a branch (not a detached head)
22:18 Eugene So do it on a branch then
22:18 Eugene Temporary branches are cheap
22:20 _28_ria joined #git
22:20 blackwell joined #git
22:20 bipolar joined #git
22:21 thiago joined #git
22:23 xall_ joined #git
22:24 tristanp joined #git
22:25 _28_ria hello, what happens, if I do git init on already existing repository? Is it going to whipe the whole history, by initialising the repository again?
22:25 ojacobson Almost completely safe.
22:26 _28_ria what do you mean by safe?
22:26 ojacobson I mean it will generally do nothing
22:26 ojacobson and will sometimes create missing things
22:26 ojacobson Try it in a scratch repo :)
22:26 smemsh Eugene: it wants me to have a tracking branch before i can rebase.  i tried setting to the local master, it has only one checkin after rebase.  i tried again tracking newhistory branch, same thing, result has only one commit.  but i think i have enough to figure it out eventually
22:28 _28_ria ojacobson: so, I will not lose my repository/history? and it just fixes inconsistencies?
22:28 _Sucks joined #git
22:29 phanimahesh joined #git
22:30 ojacobson It doesn't do either of those things.
22:30 raijin joined #git
22:30 meatchicken joined #git
22:31 ojacobson It'll create missing Git infrastructure (eg. HEAD, config, a few other things) but it won't, for example, fix damaged objects
22:31 meatchicken how can I pull from a github repository on my deployed server without entering password details?
22:31 ojacobson or even damaged configs
22:31 ojacobson meatchicken: github has deployment keys for this
22:31 meatchicken ojacobson, thanks
22:32 smemsh Eugene: oh i see, that starts me with the correct initial commit, then i reapply on top all the subsequent ones
22:33 Rodya_ joined #git
22:36 white_gecko joined #git
22:38 xall_ joined #git
22:38 Literphor joined #git
22:43 Vinnie_win_m joined #git
22:44 bluezone joined #git
22:44 eijk joined #git
22:45 zacts joined #git
22:47 ScriptThis joined #git
22:49 romerocesar joined #git
22:51 durham joined #git
22:53 l0rdPE joined #git
22:54 kebabspion joined #git
22:55 thiago joined #git
22:58 mingrammer joined #git
22:59 diegoviola joined #git
23:02 ahmed_elgabri joined #git
23:03 cdown_ joined #git
23:05 ajf- when you clone with --depth=1, how do you get more depth later ?
23:09 ajf- ah you can depth with fetch later
23:15 ahr3n joined #git
23:17 smemsh Eugene: it works after giving the range of the commits.  it is fixed! thank you!
23:17 smemsh left #git
23:19 tristanp joined #git
23:20 Blkt joined #git
23:21 unbalancedparen joined #git
23:22 sctskw joined #git
23:23 Rodya_ joined #git
23:24 Literphor joined #git
23:26 chachasmooth joined #git
23:27 Vinnie_win joined #git
23:27 hahuang65 joined #git
23:29 martinium joined #git
23:29 martinium joined #git
23:29 jottr_ joined #git
23:30 Vinnie_win_s joined #git
23:34 sarbs joined #git
23:39 romerocesar joined #git
23:40 xall_ joined #git
23:50 unbalancedparen joined #git
23:52 mingrammer joined #git
23:57 nettoweb joined #git

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