Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-07

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

All times shown according to UTC.

Time Nick Message
00:00 a3Dman joined #git
00:01 zumba_addict a build shouldn't fail on 1.1.1 if i git checkout -b 1.1.2 from 1.1.1
00:01 thierryp joined #git
00:01 zumba_addict it's weird that it was failing
00:01 drodger joined #git
00:01 zumba_addict so what I did is git checkout -b v111 from my 1.1.2 branch
00:02 zumba_addict and it worked
00:04 mda1 joined #git
00:04 Oatmeal joined #git
00:05 Rodya_ joined #git
00:05 iten joined #git
00:06 iamthad joined #git
00:06 AciD` hey guys
00:08 AciD` let's say I have a dev that pushed a bad commit (b6dada9) to master. I want to correct that by setting back master to the previous good commit (a30e23b), and create a branch 'foobar' with the bad commit so the dev can finish correcting his work. How should I proceed?
00:10 rewt AciD`: at b6dada9, "git checkbout -b foobar; push -u", then to move master back, "git checkout master; git reset --hard a30e23b; push -f"
00:10 AciD` I was tempted to use git reset but I do not want to lose his work
00:10 rewt do you have any work that's not checked in?
00:10 AciD` not on my end
00:10 AciD` what does `push -u` do?
00:11 rewt then those commands will set the branches where you want them; you'll have to tell the dev to checkout foobar before continuing
00:11 rewt pushes the foobar branch to the remote, and -u sets up the tracking
00:11 AciD` ah, 'set upsteam' ; does this create the foobar branch upstream?
00:11 AciD` ok
00:12 rewt you should also tell the dev to delete his master after he checks out foobar
00:12 rewt because his master is at b6dada9 too probably, and if he pushes anything it'll undo the reset
00:12 AciD` if he does `git fetch` I guess that will lead to conficts?
00:13 rewt `git fetch` is fine; that just gets the commits/branches
00:13 AciD` how can you 'delete his master'? ;x
00:13 rewt git brandh -d master
00:13 AciD` ah, ok
00:13 AciD` thanks for the advices, I'll do that
00:13 rewt there's nothing really special about the master, other than it's the default initial branch
00:13 rewt -the
00:14 KB_ joined #git
00:14 AciD` yep
00:15 juvenal joined #git
00:16 fmcgeough joined #git
00:17 AciD` there, just activated branch protecting with mandatory travis check
00:17 swalladge joined #git
00:17 AciD` that should prevent any stuff like that in the future :)
00:22 raijin joined #git
00:27 kbs joined #git
00:29 ivanfon joined #git
00:30 warthog9 joined #git
00:30 fstd joined #git
00:32 ivanfon joined #git
00:34 iddt joined #git
00:34 iddt here's a stumper..
00:35 iddt if i want to check out an old version of a binary file, and i do git checkout <old_commit> <filename>, will the repo grow by the size of that file i just checked out on my next commit?  or will it recognize it as an old version and simply point to that?
00:36 Eugene iddt - if the hash matches it will reuse the object
00:36 hexagoxel joined #git
00:36 iddt eugene, if that hash matches what?
00:37 Eugene The previously-commited file
00:37 iddt oh nice!
00:37 iddt cool ty :)
00:37 iddt but not if you move/rename it, right, only if it's in the same place?
00:37 Eugene Put another way: the object already exists, so its a no-op.
00:38 iddt (or assuming you do a git mv)
00:38 Eugene Nope, man git-hash-object
00:38 gitinfo the git-hash-object manpage is available at http://jk.gs/git-hash-object.html
00:38 Eugene The blob of a file will always be the same, no matter where in the tree it occurs
00:39 iddt uh, i've definitely seen the repro grow if you do like "mv <srcdir> <destdir>" instead of "git mv <srcdir> <destdir>"
00:39 Eugene Sorry, the Commit tree.
00:40 dsdeiz joined #git
00:40 dsdeiz joined #git
00:41 iddt ok, gotcha.  ty so much!
00:45 marianina8 joined #git
00:45 thebope joined #git
00:45 MarioBranco joined #git
00:45 ivanfon joined #git
00:46 marianina8 joined #git
00:48 jnewt_ joined #git
00:50 armyriad joined #git
00:51 drodger joined #git
00:52 PaulCapestany joined #git
00:54 MarioBranco joined #git
00:55 mda1 joined #git
00:55 Doginal joined #git
00:56 skypuke joined #git
00:56 a3Dman joined #git
00:58 dave0x6d joined #git
00:58 MarioBranco joined #git
01:01 fstd joined #git
01:03 MarioBranco joined #git
01:03 dstw joined #git
01:04 juvenal joined #git
01:14 fstd_ joined #git
01:15 finalbeta joined #git
01:16 rominronin joined #git
01:18 taoqy joined #git
01:18 cqi joined #git
01:18 MarioBranco joined #git
01:19 taoqy joined #git
01:19 durham_ joined #git
01:23 basdb joined #git
01:23 Goplat joined #git
01:26 a_thakur joined #git
01:28 Ryanar joined #git
01:31 pks joined #git
01:31 DarkPsydeLord joined #git
01:33 mehola joined #git
01:33 juvenal joined #git
01:35 theiostream joined #git
01:37 thebope joined #git
01:41 sunri5e joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:49 robattila256 joined #git
01:50 Dandelock joined #git
01:50 thiago joined #git
01:53 Rodya_ joined #git
01:53 sostenuto joined #git
01:54 orbyt_ joined #git
01:54 d^sh joined #git
01:56 Vampire0 KB_, I'd say this is more a setting of the terminal window you use. Try to find a setting there. I cannot help with that, because when on Windows I work from Cygwin in ConEmu
01:59 Emperor_Earth joined #git
02:01 xall joined #git
02:02 thierryp joined #git
02:03 Rodya_ joined #git
02:03 dsdeiz joined #git
02:03 dsdeiz joined #git
02:05 grawity joined #git
02:06 a_thakur joined #git
02:06 rxo joined #git
02:08 fatalhalt joined #git
02:08 dsdeiz joined #git
02:10 Kaisyu joined #git
02:11 raijin joined #git
02:14 lagothrix joined #git
02:17 hexagoxel joined #git
02:20 Vampire0 joined #git
02:21 jameser joined #git
02:25 ojdo joined #git
02:27 inflames joined #git
02:30 Rodya_ joined #git
02:33 KB_ Thanks Vampire0. There seems to be a recent issue logged in the git-for-windows branch on GitHub, so I'll see what the outcome of that will be
02:37 a_thakur joined #git
02:42 cahoots_ osse, thanks for the help today
02:42 chachasmooth joined #git
02:44 lb1c joined #git
02:46 gfixler joined #git
02:47 rominronin joined #git
02:49 justan0theruser joined #git
02:52 jstimm joined #git
02:53 prg3 joined #git
02:54 DarkPsydeLord joined #git
02:54 Vortex34 joined #git
02:54 juvenal joined #git
02:55 DarkPsydeLord joined #git
03:00 aavrug joined #git
03:00 basdb joined #git
03:00 pks joined #git
03:00 wxg joined #git
03:01 prg3 joined #git
03:01 aavrug joined #git
03:02 spaceraspi joined #git
03:04 thierryp joined #git
03:05 thebope joined #git
03:09 jeffreylevesque joined #git
03:11 xall joined #git
03:15 prg3 joined #git
03:19 toothe left #git
03:20 finalbeta joined #git
03:23 prg3 joined #git
03:23 juvenal joined #git
03:26 hygeia joined #git
03:29 hygeia left #git
03:29 pifon joined #git
03:30 lavalamp joined #git
03:33 Mavericks joined #git
03:34 mehola joined #git
03:34 xall joined #git
03:35 Mavericks how to stash a changes to a single file ?
03:36 Mavericks git stash save <filename with path> <stashname> didn't work
03:36 Mavericks git diff <filename wiht path> > singlefilechanges does work
03:36 tsutsu joined #git
03:37 Mavericks but how do I apply that ? is it git apply or import <singlefilechanges> ?
03:39 tsutsu I'm trying to figure out how to use git-rerere; I've enabled it, it's captured a recorded resolution, but if I go and do the exact same merge over again, I get "Resolved ... using previous resolution", but directly following that is still "Automatic merge failed; fix conflicts and then commit the result."
03:39 Andrew_K joined #git
03:39 tsutsu And if I try any of the git-rerere commands myself, they all have no output with an exit status of 0.
03:40 Cabanoss- joined #git
03:41 hvxgr joined #git
03:41 Mavericks nvm thanks folks
03:43 Mavericks tsutsu: does anything at http://stackoverflow.com/search?q=%5Bgit%5D+rerere help ?
03:45 tsutsu Mavericks: just googling wasn't helping, but that lead to http://stackoverflow.com/questions/18003917/git-rerere-does-not-auto-commit-autoupdated-merge-resolutions surprisingly quickly
03:45 Mavericks tsutsu: cool!
03:46 joki joined #git
03:46 tsutsu though it doesn't quite fit the behavior I'm seeing; the answer to that suggests using `git rerere diff`—which, like I said, just does nothing and exits seemingly no matter what for me
03:47 tsutsu and also, the file itself isn't staged, unlike in their answer
03:47 tsutsu (it's still marked "both modified" rather than "modified")
03:49 tsutsu and when I run git-diff, I get this weird little output: https://pastebin.com/raw/agf6A58w
03:51 tsutsu ah, wait, that's the --autoupdate part, I think; never mind!
03:53 tnecniv joined #git
03:54 tnecniv hi. i am not a git guru. i accidentally ran `git reset HEAD <file>` when i meant to do `git checkout -- <file>`. what did i do to my repo
03:55 sostenuto joined #git
03:56 prg3 joined #git
03:56 tsutsu reset writes files from commits to the stage; checkout writes files from commits to your worktree. git-reset HEAD <file> will "clean the stage" of that file--if you had previously git-add'ed it but not yet git-commit'ed it, the git-reset will undo that.
03:58 tsutsu It's easier to understand once you've used all of git-add -p, git-reset -p, and git-checkout -p: you're either copying chunks from the worktree to the stage (git-add), from a ref to the stage (git-reset), or from a ref to the worktree (git-checkout).
03:59 alexggordon joined #git
04:00 jesst joined #git
04:01 tsutsu Which is to say, git-add and git-reset are basically inverses (though not if you use git-reset against a ref other than HEAD, or if you pass --hard to it.)
04:01 mehola joined #git
04:04 svm_invictvs joined #git
04:08 bannakaffalatta joined #git
04:10 capuk__ joined #git
04:11 duderonomy joined #git
04:14 peterbec` joined #git
04:14 jesst joined #git
04:16 a_thakur joined #git
04:18 dnukem joined #git
04:19 rominronin joined #git
04:19 a_thakur joined #git
04:20 Rodya_ joined #git
04:22 kyan joined #git
04:22 jrm joined #git
04:24 SwiftMatt joined #git
04:27 yaewa joined #git
04:29 sunrunner20 joined #git
04:31 ayogi joined #git
04:31 MrWoohoo joined #git
04:31 rchavik joined #git
04:35 a_thakur joined #git
04:35 a_thakur joined #git
04:36 lordjancso joined #git
04:37 pwnz0r joined #git
04:38 ayogi joined #git
04:47 jonez joined #git
04:52 moei joined #git
04:53 schleppel joined #git
04:56 elsevero joined #git
04:56 Doginal left #git
04:57 toothe joined #git
04:57 toothe anyone recommend a git-bash integration script that actually works?
04:57 toothe i can't seem to find one that works
04:57 toothe they are all out of date or lack documentation.
05:00 alexggordon joined #git
05:05 dec0n joined #git
05:06 thierryp joined #git
05:07 karols146 joined #git
05:08 rwp toothe, Huh? What is git-bash? Do you mean git for windows? Such as https://git-for-windows.github.io/
05:13 pks joined #git
05:13 howdoi joined #git
05:15 Bock joined #git
05:15 dhollinger joined #git
05:21 Rodya_ joined #git
05:22 toothe rwp: meaning, I want my bash terminal to tell me which branch I am in.
05:22 fakenerd joined #git
05:22 toothe and related information.
05:23 onehrxn joined #git
05:24 freimatz joined #git
05:28 Brski joined #git
05:29 chris3492 joined #git
05:29 Introoter joined #git
05:29 afuentes joined #git
05:32 dvaske joined #git
05:34 overlord_tm joined #git
05:34 Noodlewitt joined #git
05:34 elsevero joined #git
05:35 diogenese joined #git
05:37 a_thakur joined #git
05:38 spaceraspi joined #git
05:39 a_thakur joined #git
05:39 netj joined #git
05:40 a_thakur joined #git
05:41 sz0 joined #git
05:42 Pulp joined #git
05:44 sbulage joined #git
05:45 sea-gull joined #git
05:46 Raging_Hog joined #git
05:50 acetakwas joined #git
05:51 rominronin joined #git
05:51 alexggordon joined #git
05:52 ThomasLocke joined #git
05:52 ThomasLocke joined #git
05:53 robotroll joined #git
05:55 star_prone joined #git
05:58 rscata joined #git
05:58 zerow joined #git
05:59 Sleepy63 joined #git
06:00 Rodya_ joined #git
06:04 King_Hual joined #git
06:04 King_Hual joined #git
06:05 zeroed joined #git
06:06 rominronin joined #git
06:07 venmx joined #git
06:14 User458764 joined #git
06:15 imack joined #git
06:16 mmlb joined #git
06:22 JeroenT joined #git
06:22 kurkale6ka joined #git
06:25 zeroed joined #git
06:25 zeroed joined #git
06:25 irqq joined #git
06:25 chele joined #git
06:26 def_jam joined #git
06:27 eb0t_ joined #git
06:27 qt-x joined #git
06:27 inflames joined #git
06:29 styler2go left #git
06:30 elsevero joined #git
06:32 elsevero joined #git
06:35 mda1 joined #git
06:35 thierryp joined #git
06:37 jnavila joined #git
06:40 spaceraspi joined #git
06:42 pks joined #git
06:43 lordjancso joined #git
06:50 chardan joined #git
06:50 javahorn joined #git
06:51 javahorn Hi
06:51 gitinfo javahorn: 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.
06:53 javahorn How to undo one single file commit(among multiple files) . I have pulled the latest main branch code but yet not pushed it. As i notice, at the time of push, it shows two files(one file, where i have done name change,but it shows original final name what i began with and one other file which i need push at all but in the past i have committed it)?
06:54 bitslip joined #git
06:56 jagob joined #git
06:56 javahorn which i need push at all but in the past i have committed it)? ---> which i need NOT push at all but in the past i have committed it)?
06:57 elect_ joined #git
06:58 rominronin joined #git
07:00 canoon joined #git
07:00 canoon joined #git
07:01 Raging_Hog joined #git
07:01 mika joined #git
07:03 Tobbi joined #git
07:04 rokups joined #git
07:04 scoobertron joined #git
07:04 spaceraspi joined #git
07:05 cqi joined #git
07:09 TomyWork joined #git
07:10 javahorn any suggestion?
07:10 ispn joined #git
07:16 Nilesh_ joined #git
07:16 mike_ joined #git
07:17 canoon joined #git
07:17 manuelschneid3r joined #git
07:20 a_thakur joined #git
07:20 a_thakur joined #git
07:21 sea-gull joined #git
07:21 Rodya_ joined #git
07:22 Forlorn joined #git
07:28 Raging_Hog joined #git
07:28 cyphase joined #git
07:40 Tobbi joined #git
07:45 JeroenT_ joined #git
07:46 IRQ` joined #git
07:46 lmatteis joined #git
07:48 ZyX-I joined #git
07:49 tocka joined #git
07:50 MattMaker joined #git
07:52 nomike31 joined #git
07:53 logihpdell joined #git
07:53 nomike31 hi
07:53 gitinfo nomike31: 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.
07:54 logihpdell there we go
07:54 logihpdell so i have a pc and a laptop, and im trying to setup a repository for an eclipse workspace
07:55 logihpdell last time i tried i had problems getting the pc to recognize the pulled files
07:55 logihpdell becuase they did not have the other project related files
07:55 logihpdell due to the eclipse ignore files and such
07:56 logihpdell I initialized the workspaces on both machines so far
07:56 nomike31 I don't seem to get how branches are handled within git in regards to a remote. E.g.: I have a bare-git repository with only a "master" branch, with closes "A" and "B". I go to "B", do a "git checkout -b blah", change something, commit. How do I properly push this branch to "origin" now?
07:56 nomike31 s/closes/clones/
07:58 canoon git push origin blah ?
08:01 Tobbi joined #git
08:02 canoon nomike31, ^?
08:03 MarioJC joined #git
08:07 __main__ joined #git
08:08 marcogmonteiro joined #git
08:11 Milos joined #git
08:13 flaviodesousa joined #git
08:13 notebox joined #git
08:16 aard_ joined #git
08:16 lordjancso_ joined #git
08:18 King_Hual joined #git
08:18 King_Hual joined #git
08:18 rcn joined #git
08:20 xall joined #git
08:26 xaa__ joined #git
08:27 Snugglebash joined #git
08:34 manuelschneid3r joined #git
08:34 fragMental joined #git
08:35 rivarun joined #git
08:37 dersand joined #git
08:38 ronskisika joined #git
08:39 r0073r joined #git
08:42 finalbeta joined #git
08:44 kexmex joined #git
08:45 xdqioh joined #git
08:46 leeN joined #git
08:48 clmsy joined #git
08:49 D092M joined #git
08:49 marcogmonteiro joined #git
08:51 MattMaker joined #git
08:53 seni joined #git
08:54 govg joined #git
08:59 JeroenT joined #git
08:59 FilipNortic joined #git
09:00 mehola joined #git
09:04 makinen hello
09:05 koneko joined #git
09:05 Darcidride joined #git
09:06 makinen can I revert git reset --soft HEAD^
09:10 canoon makinen, git reflog and find the old commit then git reset --soft <old commit>
09:10 Anja joined #git
09:11 MineCoins joined #git
09:14 Taikibansei joined #git
09:17 star_prone joined #git
09:20 a_thakur joined #git
09:20 Murii joined #git
09:20 t0by joined #git
09:20 t0by joined #git
09:20 tvw joined #git
09:24 aidalgol joined #git
09:25 Vampire0 makinen, `git reset --soft HEAD@{1}` if you did not do anythen else yet
09:26 mmh joined #git
09:29 xaa joined #git
09:30 rts-sander I can do git reset HEAD~2 to go backwards two commits, but can I also go forwards two commits?
09:30 rts-sander to commits that I will make in the future
09:31 canoon rts-sander, just run git commit -m '' --allow-empty twice
09:32 rts-sander the future doesn't hold the solutions that I need :(
09:33 oaao joined #git
09:33 canoon may have to actually do some work instead :(
09:35 masuberu joined #git
09:36 quantumbyte joined #git
09:36 quantumbyte Hey
09:36 gitinfo quantumbyte: 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.
09:37 quantumbyte Okay, I've got a question. I accidentally rebased a branch I pushed already
09:37 quantumbyte I should have merged it I guess, what can I do now?
09:37 finalbeta joined #git
09:37 quantumbyte There was master with 30 commits, dev with 9 and now I have a new one with 39 commits, which should be the new master, but I can't push it of course
09:38 SilverBe joined #git
09:38 canoon you can just revert to the already pushed version
09:38 rorro joined #git
09:40 ChiLL_SurF joined #git
09:40 quantumbyte But I don't want to lose the changes I made in the rebase process
09:40 quantumbyte Also, no one else used the remote version of the dev branch
09:40 rts-sander look in the reflog before you did the rebase
09:40 quantumbyte whats the reflog?
09:40 snits joined #git
09:41 canoon quantumbyte, so you want to overwrite the remote branch?
09:41 yarekt !backup
09:41 gitinfo 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.com/GitBestPractices/#backups
09:41 quantumbyte yes I think so.
09:41 canoon git push -f origin <branch>
09:41 quantumbyte Or if it is possible I want to take the changes I made in the rebase process and instead put them in a single commit, is that possible?
09:41 nomike31 canoon, I prepared an example which is as easy as possible. I have a local bare repository in "bare" and two clones in "foo" and "bar". I've added one file in "foo/master" pushed it to origin and did a pull in "bar". Now I switched to a new branch in "foo" with "git checkout -b 1.0-devel". And did a "git push origin devel-1.0".
09:42 canoon quantumbyte, that's kinda possible but sounds like you are happy with the rebase you could just push that
09:42 nomike31 If I do a "git pull" now I get "There is no tracking information for the current branch.".
09:43 quantumbyte canoon, okay then I'll do that. Just force push it. Thanks!
09:44 chele_ joined #git
09:44 canoon nomike31, you just git branch --set-upstream-to=origin/1.0-devel
09:44 canoon and then git pull will work with no arguments
09:45 Snugglebash joined #git
09:45 canoon that's automatically done when you create a branch from a remote
09:49 ShapeShifter499 joined #git
09:49 quantumbyte left #git
09:51 umbSublime joined #git
09:52 MattMaker joined #git
09:52 alexggordon joined #git
09:54 nomike31 How can I branch from a remote?
09:55 canoon git checkout -b 1.0-devel origin/1.0-devel ?
09:56 Anja joined #git
09:56 makinen how can I commit again the changes after git reset --soft HEAD^
09:56 mikecmpbll joined #git
09:57 PioneerAxon joined #git
09:57 makinen I removed the commit which had code that I didn't want to be pushed at all
09:57 canoon but you want that code back?
09:59 makinen no I want to commit and push rest of the code except one line
09:59 nomike31 "git checkout -b 2.0-devel origin/2.0-devel" results in "fatal: Cannot update paths and switch to branch '2.0-devel' at the same time."
09:59 canoon makinen, do git reflog find the commit and then git checkout <commit> -- .
09:59 canoon that will get all the changes from that commit and then you can commit them
10:01 canoon nomike31, try a git fetch first
10:03 Vampire0 makinen, so you want to remove that single line from the index and commit again right?
10:04 pbrewczynski joined #git
10:04 Vampire0 makinen, then either change the line back in the worktree, add it to the index and commit, or use `git reset -p` to remove that change from the index, while keeping it in the worktree
10:04 Vampire0 makinen, then commit
10:05 mda1 joined #git
10:06 nomike31 what do you mean with "git fetch"? If I do this before the "git checkout -b 2.0-devel origin/2.0-devel" nothing happes (as I would expect, because what should it do?) and it doesn't change my situation.
10:06 Snugglebash joined #git
10:07 flaviodesousa left #git
10:08 nomike31 ahh..OK. I create the branch locally, push it to origin, and pull it again from origin.
10:10 nomike31 Ok, obviously not. I still don't get it.
10:12 Vampire0 nomike31, do you have a file called 2.0-devel in the folder origin? o_O
10:12 Vampire0 nomike31, because that is what I would interpret in your error message on first sight
10:13 Vampire0 nomike31, besides that `git checkout 2.0-devel` should be enough if you have only one remote. Because then there is automatically a local branch created that tracks that same-named remote brnach
10:13 Vampire0 s/brnach/branch/
10:14 nomike31 No, I only have an empty file called "test1" so far. Whatever, what I did not "git checkout -b 2.0-devel" "git push origin 2.0-devel" and "git push --set-upstream origin 2.0-devel".
10:14 Snugglebash joined #git
10:14 nomike31 Vampire0, well, I don´t have a "2.0-devel" branch yet. I want to create a new branch which is available locally and remotely.
10:15 ilithium joined #git
10:15 Vampire0 nomike31, ah, that also explains the error message
10:15 ilithium Hey all. Do any of you have good experience with git submodules?
10:16 Vampire0 nomike31, as there is no branch 2.0-devel in remote origin, `origin/2.0-devel` is interpreted as path
10:16 SteffanW joined #git
10:16 nomike31 Yes. I boiled it down to "git checkout -b 3.0-devel" and "git push --set-upstream origin 3.0-devel" so I only need two commands to be set up.
10:16 Vampire0 nomike31, so yes, create a branch with `git branch` or `git checkout -b` locally, then push it to the remote, that's the right way to go
10:17 Vampire0 nomike31, you wouldn't have needed to do the 2. and 3. command, just the 3. would have been enough
10:17 Vampire0 nomike31, ah, yes, I see you got that already :-)
10:17 nomike31 Yes. But I have another issue at a later stage. Let me quickly try to reproduce it...
10:18 basiclaser joined #git
10:18 nevodka joined #git
10:18 Vampire0 ilithium, heavily depends on the use-case. If you have multiple repos that you develop concurrently, submodules are in my opinion crap. If you integrate some 3rd party code that you update from time to time to a new version, maybe making some own changes to it, but not updated too often, that is what submodules are suitable for
10:19 nevodka joined #git
10:19 ilithium Vampire0: the latter is the situation I'm using them for: third party modules linked into my project's repository. the question I have is: how do I contribute back to that third party module's repo if it's a submodule of my project?
10:20 Vampire0 ilithium, depends on the project like always with contributions
10:21 Vampire0 ilithium, if it e. g. is a GitHub project accepting PRs, and you created a fork that you use as submodule, then just as usual create a branch with your changes, push them and create pull request
10:21 Vampire0 ilithium, or send them format-patch output files by mail
10:22 ilithium Ah, so I should be forking these repos before pulling them in as a submodule?
10:22 Vampire0 ilithium, as I said, depens on the receiver
10:22 Vampire0 ilithium, you can if you want
10:22 Vampire0 ilithium, you can also use the upstream as submodule, and have a separate fork where you prepare PRs
10:23 Vampire0 ilithium, if you have the upstream as submodule you cannot bring in own modifications to be used by your main project of course, because you cannot push to upstream
10:23 nomike31 So, I have branches "master", "1.0-devel" and "2.0-devel" now. "master" is checked out in directory "foo", "2.0-devel" is checked out in directory "bar".
10:24 Vampire0 ilithium, those would then also be available for you locally and as soon as someone else clones your main repo and tries to update the submodule it will fail because the commit you made is only in your local repository
10:24 Vampire0 nomike31, you mean with `git worktree`?
10:24 ilithium Ah OK - so it sounds like submodules might not be the right approach
10:24 Worki left #git
10:24 raijin joined #git
10:24 Vampire0 nomike31, or how did you checkout different branches in different directories?
10:25 Vampire0 ilithium, not? well, that's up to you to decide. :-) !subre
10:25 gitinfo ilithium: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
10:26 nowhereman joined #git
10:29 nomike31 git clone bare.git foo ; git clone bare.qit bar; (cd foo ; git checkout master) ; (cd bar ; git checkout 1.0-devel)  # this is essentially what I did
10:30 tcorneli joined #git
10:32 davimore_ joined #git
10:33 Vampire0 nomike31, if you want to have multiple branches checked out, I'd recommend to use man git worktree, that is what it is made for and you don't need to have the whole repository on disk multiple times. Besides that you can easily flow over changes, cherry-pick commits and so on which is not easily possible if you have multiple clones
10:33 gitinfo nomike31: the git-worktree manpage is available at http://jk.gs/git-worktree.html
10:33 Vampire0 nomike31, but that wasn't your problem, was it?
10:36 BSaboia joined #git
10:37 nomike31 Well, the issue is: I'm using git for managing scripts for puppet, a configuration management software. On the puppet-master, I have a folder "environments" and when I'm on a client and start puppet I can specify "--environment=something" and the server will take the scripts from "./environments/something". So I have to have multiple checkouts of the repository next to each other.
10:39 nomike31 The issue I'm facing now is: I'm in checkout "foo" which is at branch "master". There I change something, push it to origin. Then I, or someone else, goes to checkout "bar" which is at branch "1.0-devel", does a "git pull" (you can see that the hash of the HEAD revision from "master" is changing).
10:40 chris3492 joined #git
10:40 nomike31 And if I do a "git merge master" now, it tells me that there is nothing to merge. I need to do "git checkout master ; git pull ; git checkout 1.0-devel" first for "git merge master" to work. And while this is annoying for one branch it is unbearable if you have three or more branches.
10:40 JeroenT_ joined #git
10:41 dendazen joined #git
10:41 limitingfactor joined #git
10:43 alexggordon joined #git
10:43 acetakwas joined #git
10:45 immae nomike31: git pull origin master ?
10:45 immae from the 1.0-devel branch
10:45 dnukem joined #git
10:45 Snugglebash joined #git
10:45 IRCFrEAK joined #git
10:46 immae or, still from the 1.0-devel branch, "git pull" and "git merge origin/master"
10:46 Plippz joined #git
10:47 IRCFrEAK left #git
10:49 Vampire0 nomike31, that is no issue. As I said, man git worktree is exactly for the usecase to have two or more branches checked out next to each other in separate worktree directories
10:49 gitinfo nomike31: the git-worktree manpage is available at http://jk.gs/git-worktree.html
10:49 Plippz after `git reset master` at a origin/master, hoping to revert it back to that commit, there are suddenly a lot of unstaged changes in git status. I `add`ed and committed. But now the diff between master and origin/master is great. I'm confused about what I just did..
10:50 finalbeta joined #git
10:50 nomike31 I will have a look at this worktree thingy.
10:50 Vampire0 nomike31, other than that, as immae said. if you use merge, rebase or pull without saying what to integrate, then the upstream branch is used, otherwise what you specify is used. If you specify "master" while there is a local master branch that is used. If you want to integrate the remote branch directly, just tell Git to do it
10:51 Vampire0 Plippz, there are 3 flavors of reset, --mixed (the default), --hard and --soft
10:51 Vampire0 Plippz, all three update the branch pointer to what you told it to reset to
10:52 Vampire0 Plippz, --soft only does this, but does not touch worktree and index, --mixed also resets the index to the given commit-ish but does not touch the worktree, --hard resets both, the index and the worktree to the given commit-ish
10:53 Vampire0 Plippz, so in your case you had all the changes still in the worktree, and now committed them again in one commit
10:53 MattMaker joined #git
10:53 afuentes joined #git
10:53 Vampire0 Plippz, you probably wanted to do a --hard reset instead and can do it now still: `git reset --hard @~` But be aware that you loose local modifications if you did any.
10:55 Plippz ah, now I understand thanks, and that worked well
10:56 Vampire0 Plippz, man git reset for more information about what reset can do ;-)
10:56 gitinfo Plippz: the git-reset manpage is available at http://jk.gs/git-reset.html
10:56 Plippz what does @~ mean?
10:57 Vampire0 Plippz, man gitrevisions :-)
10:57 gitinfo Plippz: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
10:57 Vampire0 @ is short for HEAD, ~ means parent
10:57 ilithium left #git
10:57 Vampire0 So it is short for "parent of the currently checked out commit"
10:58 Plippz thanks!
10:59 marianina8 joined #git
11:00 rts-sander what's the difference between @~ and @^ then?
11:00 amrits joined #git
11:01 rts-sander oh it's parent commit that has multiple parents
11:01 Vampire0 rts-sander, there is no difference between them
11:01 Vampire0 rts-sander, there is a difference between @~2 and @^2 though
11:01 Vampire0 rts-sander, @~2 is the same as @^^
11:02 makinen I still don't know how to solve my problem. This a part the git log http://pastebin.ca/3792361
11:02 javahorn How to undo one single file commit(among multiple files) . I have pulled the latest main branch code but yet not pushed it. As i notice, at the time of push, it shows two files(one file, where i have done name change,but it shows original final name what i began with and one other file which i need NOT push at all but in the past i have committed it)?
11:02 Vampire0 rts-sander, @~2 is the grand-parent @^2 is the second parent of a merge commit
11:02 makinen I'd like to change the message of the first commit. Then, I'd like to change one line in the latest commit so that the line doesn't appear anywhere in the commit history
11:03 rts-sander I see, thanks for the info Vampire0
11:03 Vampire0 makinen, that paste-bin is expired, but from what you say, do an interactive rebase (man git rebase)
11:03 gitinfo makinen: the git-rebase manpage is available at http://jk.gs/git-rebase.html
11:06 b100s joined #git
11:06 Unbeerable joined #git
11:07 Unbeerable Hi. I need a hook to create something like a custom changelog after pulling to local repo. I want to have a list of commits which appeared after merge. What is the simplest way to do it?
11:08 Unbeerable I'm looking into post-merge hook, but don't yet understand how to get the revision before merge to make a diff or log
11:08 osse Unbeerable: git log mergcommit~1..mergecommit
11:08 Unbeerable I do not know how many commits was merged
11:09 User458764 joined #git
11:09 osse no need
11:09 Unbeerable so what is "mergecommit"?
11:09 osse the hash of the merge commit
11:10 osse or maybe the branch name. anything that identifies it
11:10 osse immediately after 'pull' you can use HEAD
11:11 Unbeerable wow, it works
11:11 Unbeerable it's a kind of magic
11:14 Ryanar joined #git
11:15 rnsanchez joined #git
11:15 polyrob joined #git
11:17 Tobbi joined #git
11:18 juvenal joined #git
11:19 g105b joined #git
11:21 mrnd joined #git
11:23 Darcidride joined #git
11:23 fakenerd joined #git
11:23 nomike31 I managed to recreate my exact problem as simple as possible: https://gist.github.com/nomike/4758f8651da34a5434fe068db1ac2ab6 And I have no idea why I can't push at the end.
11:24 YuGiOhJCJ joined #git
11:24 uyptva joined #git
11:26 _ikke_ nomike31: checking
11:26 canton7 nomike31, you can't push because the remote repository have commits which you don't have
11:26 canton7 s/have/has/
11:26 nomike31 Though so, that's why I did a "git pull" then. But after that I still get the same error.
11:27 canton7 ah
11:27 canton7 !lol in bar ?
11:27 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
11:27 canton7 let's see what git thinks is going on
11:28 jfr_ joined #git
11:29 nomike31 https://gist.github.com/nomike/cb726f2c09b481d4e42e460e987d27a6
11:29 canton7 wait, I missed there was a 'v1' branch knocking around
11:29 canton7 'git config push.default' ?
11:31 nomike31 prints out nothing, returns with an error
11:31 canton7 looks like it's an old git, where push.default defaults to 'matching'
11:31 nomike31 v. 1.7.0
11:31 canton7 line 96 shows that 'git push' tried to push both v1 (which succeeded), and master (which failed)
11:31 canton7 yeah, that's an old git
11:31 canton7 the 'git pull' just updated v1, but didn't touch master
11:31 nomike31 Well it's Redhat Enterprise Linux 6, there is no newer version.
11:32 nomike31 So "git pull" only updates the current branch while "git push" is trying to push all branches? That doesn't make sense.
11:32 canton7 well, 'git pull' only updating the current *local* branch makes sense. "updating" is a merge, which might conflict, so it only makes sense to do it to the currently-checked-out branch
11:32 alexggordon joined #git
11:33 canton7 the git maintainers agreed that 'git push' defaulting to pushing all branches didn't make sense, agreed, and that was changed many years ago now
11:33 nomike31 Is there a way to change the configuration of git 1.7.1 to behave like that?
11:34 canton7 see push.default in man git config. 'simple' isn't available on your git version, so I'd go for 'current' or 'upstream'
11:34 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
11:34 canton7 (current pushes to the remote branch with the same name, upstream pushes to the branch you've set up tracking for (with git push --set-upstream)
11:34 tobiasvl 1.7.1 :o
11:35 canton7 heh, 1.7.0 is now more than 7 years old
11:35 ninsei joined #git
11:35 moritz time for a divorce (from 1.7) :)
11:35 kexmex joined #git
11:36 nomike31 Well, I can't upgrade. There is no newer version for RHEL 6, and I don't want to compile from source.
11:36 nomike31 Redhat is always very conservative about that.
11:36 canton7 sure, but expect a sub-par experience, that's all
11:37 nomike31 So, "git config push.default tracking" did the trick for me
11:37 canton7 cool
11:37 canton7 you could also have told it just to push v1, with 'git push origin v1'
11:37 canton7 (but I always set push.default to tracking in the 1.7 days)
11:39 nomike31 "git config --global push.default tracking" is even better.
11:40 tobiasvl nomike31: RHEL7 ;)
11:41 tobiasvl well, it has 1.8.3.1 ...
11:42 canton7 they didn't change the push.default default value until 2.0
11:43 tobiasvl yeah
11:43 sotoz joined #git
11:44 dgonzo joined #git
11:44 p4trix joined #git
11:47 strk joined #git
11:47 nomike31 yeah. damn conservatives. I mean, I understand them, they can promise 100% binary compatibility for 12 years, but it's very annoying to be always at least 5 years behind with everything.
11:47 jonez joined #git
11:47 strk is there a command to have git check each file in a tree with the checks performed by `git diff --check` ?
11:47 bariscant joined #git
11:47 strk (trailing blanks, I'm after, not sure what else --check checks for)
11:48 re1 joined #git
11:50 osse but compiling git from source is fun!
11:52 User458764 joined #git
11:54 MattMaker joined #git
11:57 avar strk: git show --check
12:00 re1_ joined #git
12:02 Snugglebash joined #git
12:03 HoierM joined #git
12:03 Snugglebash joined #git
12:04 Snugglebash joined #git
12:05 Snugglebash joined #git
12:05 Snugglebash joined #git
12:06 Snugglebash joined #git
12:07 Snugglebash joined #git
12:08 Snugglebash joined #git
12:09 kegster joined #git
12:11 strk avar: diesn't that only act on HEAD commit ?
12:11 strk (yes it does)
12:16 Tobbi joined #git
12:16 raspado joined #git
12:18 borkr joined #git
12:19 aivkiv joined #git
12:23 mobilephone joined #git
12:24 ziombelas joined #git
12:25 mda1 joined #git
12:25 lolopolosko joined #git
12:25 i7c strk: for c in $(git log --format=%H); do git show --check $c; done
12:25 i7c ?
12:26 gugah joined #git
12:26 manuelschneid3r joined #git
12:26 avar strk: then git diff --check <from>..<to>
12:27 Marumarsu joined #git
12:28 i7c But why would he care about any whitespace error that was ever introduced and potentially long removed? :)
12:28 i7c Ah, I just answered my own question. He doesn’t care. ^^
12:29 rorro joined #git
12:29 i7c Or to be honest, I don’t know what he wants.
12:29 i7c *hint hint* clarify
12:29 Snugglebash joined #git
12:29 MarioJC joined #git
12:29 Vampire0 i7c, well, he wants to see all whitespace errors that are currently present I think :-)
12:31 i7c grep -rE '\s+$'
12:31 i7c I guess
12:32 lolopolosko Hi all!
12:32 lolopolosko Can I push my git commit template and setup it automatic if someone clone my repo?
12:32 gitinfo lolopolosko: 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.
12:33 Vampire0 i7c, doesn't it check more like line endings, newline at end of file and so on?
12:33 i7c 13:47 <strk> (trailing blanks, I'm after, not sure what else --check checks for)
12:34 Vampire0 lolopolosko, I don't think so. You could provide a script that configures it and tell in some readme to execute it after cloning
12:34 _ikke_ lolopolosko: nope
12:34 fees joined #git
12:34 lolopolosko Vampire0, _ikke_: Thanks
12:34 i7c Vampire0, it also checks for unresolved conflicts (the <<<<<<<< marker stuffs)
12:34 Vampire0 i7c, ah, ok, then probably yes, `git grep '\s+$'`
12:35 i7c probably needs -E, but who knows for sure.
12:37 flux_ joined #git
12:37 Uneliasmarsu joined #git
12:37 thomas-oneill left #git
12:38 Marumarsu joined #git
12:39 Murii joined #git
12:39 Vampire0 i7c, strk: so then `git grep '\s\+$'`
12:40 MineCoins joined #git
12:41 no_gravity joined #git
12:42 kharloss joined #git
12:44 fmcgeough joined #git
12:44 i7c git grep -E '\s+$'
12:44 i7c I’m happy to point it out one more time.
12:44 i7c :)
12:44 digidog joined #git
12:45 fakenerd joined #git
12:45 Vampire0 i7c, nope, not with the \ in front of the +. ;-) `git grep '\s\+$'` and `git grep -E '\s+$'` should give the same result
12:46 oleo joined #git
12:46 tasslehoff joined #git
12:46 i7c Ah, yeh right.
12:46 i7c If you like escaping. :D
12:47 tasslehoff Anyone know of a public repo using subtrees? I want to take a look at how the history of such repos can look.
12:48 i7c If you don’t find one, just create a repo and pull in any other repo as subtree.
12:48 i7c Or clone one and pull in another one.
12:49 tasslehoff i7c: I did that and got an idea of how it will look with --squash, but wanted to see if I'm right about how it will turn out in the longer run :)
12:50 i7c Oh I see.
12:50 tasslehoff in gitk/tig I'm guessing I will have one vertical line per subtree, with the occasional merge commit.
12:50 tasslehoff could maybe have said branch instead of vertical line, but it didn't feel right :)
12:52 bariscant joined #git
12:54 nd- joined #git
12:55 _Vi joined #git
12:57 Ryanar joined #git
12:57 Eryn_1983_FL joined #git
12:58 Bennux joined #git
12:58 juvenal joined #git
12:59 sarri joined #git
12:59 sarri joined #git
13:00 marianina8 joined #git
13:00 plasticle joined #git
13:02 sbulage joined #git
13:03 jeffreylevesque joined #git
13:03 rwb joined #git
13:04 jnavila joined #git
13:05 lavalamp joined #git
13:08 am55 joined #git
13:08 livingstn joined #git
13:08 ToBeFree joined #git
13:11 sunri5e joined #git
13:14 makinen pfft i hate git
13:16 seni joined #git
13:16 _ikke_ makinen: what happened?
13:19 makinen I'm trying to remove a couple of commits from the index, modify the code and make a new commit so that there's no trace of the removed commit anywhere
13:19 makinen +s
13:19 Joefish joined #git
13:19 DarkPsydeLord joined #git
13:21 catern hey #git
13:21 _ikke_ makinen: git reset HEAD~<N>, make changes, git commit
13:22 catern I kind of want a third level of staging above the index and files
13:22 catern maybe someone can advise on how I should do what I want to do
13:22 catern I am in the middle of an interactive rebase and I am editing a commit
13:23 catern I want to split this commit into two, which combine to make the full commit
13:23 rosiu joined #git
13:23 catern to do this I need to edit the files on disk to remove changes, and then add them back in
13:23 canton7 stage the bits in the first commit, commit, stage the rest, commit, continue the rebase
13:24 canton7 or, if you want to edit the files on disk: stash save, apply, edit, stage and commit, stash pop, stage and commit
13:24 canton7 s/apply/stash apply/
13:24 catern but when I stash pop that second time, I'll have conflicts
13:25 catern because the diff I stashed doesn't cleanly apply since I've made more changes
13:25 chipotle joined #git
13:25 canton7 untested, but my assumption is that you wouldn't: it would take the diff between the commit and the stash, realise that there's no difference for those bits, and not do anything
13:25 catern but I guess I know the answer to that: just "checkout" the stash?
13:25 catern (however one does that)
13:26 canton7 heh, you could. I think 'git rm -rf . && git co stash@{0} -- .' would work
13:26 canton7 s/co/checkout/
13:26 canton7 ... but the partial staging route is still easiest if you can
13:26 catern oh yeah I definitely usually use partial staging
13:26 catern but I am finding myself needing to do more extensive edits and actually introduce new changes
13:27 catern also, couldn't I just git checkout stash@{0}
13:27 catern no need for the rm -rf?
13:27 Dougie187 joined #git
13:27 canton7 that wouldn;t remove files which are not present in the stash
13:27 canton7 (ah, no, that stash pop *does* conflict. That's a shame)
13:28 canton7 oh, no. I read the message wrong. It's fine.
13:28 kegster joined #git
13:30 canton7 so yeah, my stash pop option will work fine, I think
13:31 livingstn joined #git
13:32 netj joined #git
13:32 User458764 joined #git
13:33 notebox joined #git
13:34 gk_1wm_su joined #git
13:34 dodobrain joined #git
13:34 dodobrain hi all
13:34 i7c hi dodobrain
13:35 dodobrain i want to find all the files in certain directories that have changed or been added since a previously tagged commit
13:35 osse dodobrain: git diff v1.2 -- thisdir that/dir
13:35 perlpilot dodobrain: git diff --name-only COMMIT
13:35 perlpilot or ... that
13:36 JeroenT joined #git
13:36 dodobrain is there a way to specify a pattern for the dir?
13:36 osse yes
13:36 dodobrain or do i have to do that outside of git from bash?
13:37 osse no
13:37 dodobrain essentially it is a django project. there are many dirs (called 'apps' in django lingo) and each dir has a 'migrations' dir within it. these dirs have a bunch of .py files
13:38 dodobrain so i want to do the diff only on ./*/migrations
13:38 mda1 joined #git
13:38 Snugglebash joined #git
13:38 JeroenT_ joined #git
13:39 osse git diff v1.2 -- ':/**/migrations'
13:39 jtri joined #git
13:39 JeroenT joined #git
13:40 jtri i have a repo which has changes in it, but those changes should be reflected in a later commit i've not pulled/fetched.  is there a way to update my local repo w/o editing the filesystem and run diff to check?
13:41 osse jtri: git fetch; git diff HEAD origin/master
13:41 osse or something like that
13:43 jtri osse: i think that works, thanks!
13:43 dodobrain umm.. ok i have something weird
13:43 dodobrain i have the django project under a 'django' folder on the repo root
13:43 marianina8 joined #git
13:44 dodobrain so i tried `git diff --name-only v1.2 -- ':/django'`   this works and shows all the changed/added files across all dirs
13:44 dodobrain but if i try  `git diff --name-only v1.2 -- ':/django/**/migrations'`
13:44 dodobrain it does not return any results!
13:45 dodobrain im confused because the earlier command actually returned the django/**/migrations dirs changes
13:45 jtri ok, so git diff HEAD origin/master shows now diff, but git diff shows changes, yet I'm on master and master and origin/master point to the same commit with HEAD pointing to master
13:46 osse jtri: plain 'git diff' just diffs the working directory against HEAD
13:46 jtri *no (not now)
13:46 boombatower joined #git
13:46 osse dodobrain: try git diff --name-only v1.2 -- ':/django/**/migrations/*'
13:47 jtri so my working directory is not matching origin/master if it shows diff, right?
13:47 dodobrain osse, sweet, that works
13:47 osse jtri: no
13:48 a_thakur joined #git
13:48 osse jtri: origin/master isn't considered at all if you just type 'git diff' and nothing else
13:48 osse only the current files and HEAD
13:49 i7c jtri, so "yes" if HEAD points at origin/master :)
13:49 jtri f956d42  - jared - 2 days ago 2017-04-05 22:19:36 -0400   (HEAD -> master, origin/master, origin/HEAD)
13:49 jtri i think they all poitn to same commit
13:49 osse they do
13:49 i7c yep
13:50 jtri so git diff; and git diff HEAD origin/master; should return same result?
13:50 i7c Why is there a origin/HEAD btw ;)
13:50 i7c jtri, no.
13:50 jtri (i have no idea on origin/HEAD!)
13:50 osse origin/HEAD is the branch you get when you clone.
13:51 osse jtri: when we say current directory we mean whatever files are on disk right now. even uncommitted stuff
13:51 i7c 15:46 <osse> jtri: plain 'git diff' just diffs the working directory against HEAD
13:51 osse 'git diff foo bar' diffs two commits. it does not care about the current directory
13:51 i7c so git diff and git diff HEAD origin/master obviously do different things.
13:52 unbalancedparen joined #git
13:52 * i7c is quiet and stops interrupting osse.
13:52 ChiLL_SurF joined #git
13:52 jtri does git checkout master; git fetch update origin/master ?
13:52 i7c osse, oh right, I never cared about origin/HEAD.
13:52 i7c Never even noticed it was there. :D
13:52 osse jtri: yes
13:53 jtri perhaps i need to do that first, i think that's my issue/confusion point
13:53 osse you don't have to checkout anything to do git fetch
13:53 lavalamp joined #git
13:54 TheWild joined #git
13:54 drodger joined #git
13:54 jtri ok, i think some other things snuck in here too... but i think i understand what happend now, thanks for the help
13:54 TheWild hello
13:54 i7c hello
13:55 TheWild http://stackoverflow.com/questions/1186535/how-to-modify-a-specified-commit-in-git - how to deal with it when an editor isn't available?
13:55 dsdeiz joined #git
13:56 aboccia joined #git
13:56 moritz install an editor
13:56 TheWild I managed to achieve desired result with `git reset --hard ff8a9c8`, `git commit --amend ...` and `git format-patch --stdout ff8a9c8..7f04d9c | git am`, but is there a nicer way?
13:56 al-damiri joined #git
13:56 krelix joined #git
13:57 moritz you can cherry-pick instead of format-patch
13:57 dodobrain osse, any idea on why i had to specify the actual files rather than just the path? '.../migrations/*' as opposed to '.../migrations' ?
13:58 osse dodobrain: no
13:58 jtri so right now, i can't checkout develop (which is where i beleive the commit will match my local dir) b/c my current files appear changed rel to the cur branch (master) is there a way to do what i want, which is to switch my pointer to origin/develop and run diff from there, to confirm that's the commit matching my current directory?
13:58 sotoz joined #git
13:59 jtri guessing it sa reset of some kind
13:59 jtri perhaps soft?
13:59 TheWild moritz: git cherry-pick was exactly what I wanted. Thank you.
13:59 dodobrain osse, 'no' as in i'm perhaps asking a stupid question or the necessity of the files instead of just the path is unknown?
13:59 osse dodobrain: "no" as in, "i don't have any idea"
14:00 capuk joined #git
14:00 qqx jtri: There's no need to switch to a branch to diff against it. You should be able to just `git diff develop`.
14:01 qqx Actually I guess you'd want to use origin/develop as the last arg.
14:01 dodobrain osse, heh. thanks!
14:01 Tobbi joined #git
14:01 crose joined #git
14:02 vuoto joined #git
14:05 astrofog joined #git
14:05 jtri qqx: but if i wanted git diff to have the same behavior as git diff pointer , can i do some kind of reset which will not change the working dir but have that effect?
14:07 qqx jtri: You can use `git reset --soft COMMIT` to change the pointer without changing your working directory or index.
14:07 qqx Actually, no I take that back.
14:08 qqx That would also change the local definition of whatever branch you currently have checked out.
14:08 saml_ joined #git
14:09 qqx To avoid doing that you could do `git checkout --detach` first to get a detached HEAD.
14:09 saml_ what do you do when you want to store large asset (over 50MB)?
14:09 Es0teric joined #git
14:10 spaceraspi joined #git
14:10 sword joined #git
14:11 AaronMT joined #git
14:12 Antipsychiatry joined #git
14:14 owlbynight joined #git
14:16 jtri ok, let me ask/explain, for clarity... i'm in master which has changes reflecting commit in develop, but that commit is not reflected yet b/c i haven't fetched develop.  i can't checkout develop b/c of the local changes, so i can't update it w/ fetch
14:16 jtri i'd like to fetch the information regarding origin/* actually, so that i can diff around comparing the local files to the tree
14:17 jtri and when i'm done i'd like to set the pointer so that HEAD points to the place where the fiels actually match the repository tree
14:17 dysfigured joined #git
14:17 User458764 joined #git
14:18 doener joined #git
14:19 netj joined #git
14:19 qqx jtri: You don't need to checkout your local develop branch in order to fetch. And you will need to fetch in order to do any comparisons.
14:19 qqx I *think what I'd do in that situation is: `git fetch origin; git diff origin/develop` and verify that things look as expected.
14:20 ChiLL_SurF joined #git
14:20 qqx If that looks as expected I'd then do `git reset origin/develop` to set the remote commit as my new base without actually modifying the working tree.
14:21 dysfigured joined #git
14:24 jagob joined #git
14:24 Bennux joined #git
14:25 rorro joined #git
14:25 gk_1wm_su joined #git
14:28 LeBlaaanc joined #git
14:28 capuk joined #git
14:29 unbalancedparen joined #git
14:30 re1 joined #git
14:31 netj joined #git
14:33 synthroid joined #git
14:34 bannakaffalatta joined #git
14:35 Tobbi joined #git
14:35 cdg joined #git
14:37 Snugglebash joined #git
14:38 Es0teric joined #git
14:38 doener joined #git
14:39 strk avar, i7c both --check solutions end up checking each commit, I just want to check each file instead
14:39 avar strk: just pass -- <file path>
14:40 gk_1wm_su joined #git
14:40 i7c strk, we provided a solution with git-grep if I remember correctly. :)
14:40 gk_1wm_su left #git
14:45 MineCoins joined #git
14:45 LionsMane joined #git
14:45 Jackneill joined #git
14:46 kutsan joined #git
14:46 flavius joined #git
14:46 planigan joined #git
14:46 mjuhl joined #git
14:47 orbyt_ joined #git
14:47 mjuhl I have created a pull request, but I have one commit which should have been in an entirely different pull request. How do I go about and change that?
14:48 i7c You can remove the commit with git rebase -i
14:49 i7c And you can use git cherry-pick to get it to another branch to create another pull request.
14:50 shinnya joined #git
14:50 kutsan left #git
14:53 stonerfish joined #git
14:53 Keytap joined #git
14:53 zivester joined #git
14:57 Wikiscratch joined #git
14:59 Keytap Morning gents.  Quick question, can I add an object to the object directory without uploading it?
14:59 plasticle joined #git
14:59 Keytap Rather, without pushing it to origin/affecting any of the branches in any way?
15:01 Keytap Nevermind.  Found a better way to do what I wanted to do
15:01 gugah joined #git
15:01 hahuang61 joined #git
15:03 Ryanar joined #git
15:03 strk ah, git grep -E '\s+$'
15:03 strk I think --check also finds spaces before tabs
15:04 krelix joined #git
15:05 krelix joined #git
15:05 cyberz joined #git
15:07 kpease joined #git
15:07 kristofferR joined #git
15:08 tang^ joined #git
15:08 Keytap Does the standard say anything about adding custom directories to $GIT_DIR?
15:08 Keytap (as in `mkdir "$GIT_DIR/$CUSTOM_DIR"`)
15:10 tqswkk joined #git
15:13 Bock joined #git
15:15 dendazen joined #git
15:17 chris3492 joined #git
15:17 Bock joined #git
15:20 nexemacs joined #git
15:20 marianina8 joined #git
15:21 MattMake_ joined #git
15:22 MattMake_ joined #git
15:22 JanC_ joined #git
15:23 thiago joined #git
15:23 Marumarsu joined #git
15:24 manuelschneid3r joined #git
15:25 bannakaf_ joined #git
15:26 dnukem joined #git
15:28 rivarun joined #git
15:28 synthroid joined #git
15:29 marianina8 joined #git
15:29 plasticle joined #git
15:31 TomyLobo joined #git
15:34 todd_dsm joined #git
15:36 blackwind_123 joined #git
15:36 monjwf joined #git
15:37 Meow-J joined #git
15:38 sbasso joined #git
15:39 ankit01ojha joined #git
15:39 MineCoins joined #git
15:41 Es0teric joined #git
15:42 adir joined #git
15:46 nexemacs joined #git
15:51 IndigoTiger_ joined #git
15:52 IndigoTiger_ joined #git
15:52 marianina8 joined #git
15:53 IRQ` left #git
15:56 Keytap left #git
15:59 kegster joined #git
15:59 rorro joined #git
16:03 durham joined #git
16:03 nexemacs joined #git
16:06 Ryanar joined #git
16:07 johnmilton joined #git
16:08 madewokherd joined #git
16:09 Gustavo6046 joined #git
16:09 Gustavo6046 joined #git
16:09 jesst joined #git
16:10 Darren_ joined #git
16:10 capuk joined #git
16:10 cdg_ joined #git
16:12 rwb joined #git
16:12 svm_invictvs joined #git
16:12 drodger joined #git
16:15 lagothrix joined #git
16:17 yetithefoot joined #git
16:20 cahoots joined #git
16:20 thebope joined #git
16:20 hagridaaron joined #git
16:21 justin2 joined #git
16:29 polyrob joined #git
16:30 Murii joined #git
16:30 MineCoins joined #git
16:33 nitric joined #git
16:34 LionsMane joined #git
16:35 justin2 joined #git
16:36 nowhereman joined #git
16:37 tnecniv joined #git
16:39 aard_ joined #git
16:40 kiltzman joined #git
16:41 SwiftMatt joined #git
16:41 kiltzman joined #git
16:41 h12o joined #git
16:42 kiltzman joined #git
16:43 orbyt_ joined #git
16:44 Cavallari joined #git
16:44 jesst joined #git
16:44 kiltzman joined #git
16:44 kiltzman joined #git
16:45 kiltzman joined #git
16:45 kiltzman joined #git
16:47 nexemacs joined #git
16:49 kexmex joined #git
16:50 theiostream joined #git
16:51 pwnz0r joined #git
16:51 sbasso joined #git
16:55 cwillu_at_work joined #git
16:57 Uneliasmarsu joined #git
16:59 durham_ joined #git
17:01 h12o joined #git
17:01 aax joined #git
17:01 re1_ joined #git
17:02 theiostream joined #git
17:03 hahuang61 joined #git
17:03 raynold joined #git
17:04 ResidentBiscuit joined #git
17:06 thiago_ joined #git
17:08 chachasmooth joined #git
17:08 theiostr_ joined #git
17:09 rwb joined #git
17:09 durham joined #git
17:10 m0viefreak joined #git
17:10 hagridaaron joined #git
17:11 iddt joined #git
17:11 jackhum joined #git
17:12 h12o joined #git
17:12 choki joined #git
17:14 mroth joined #git
17:17 xaa__ joined #git
17:17 preyalone joined #git
17:18 preyalone does git clone automatically create long folder paths, e.g. git clone git@derp.com:derp/derp.git some/long/folder/path/derp ? Or are users expected to mkdir -p?
17:19 durham joined #git
17:21 bremner wouldn't it be faster to try it?
17:23 Es0teric joined #git
17:24 hfp Hey, I'm learning about git hooks. I have defined one on one machine, how can I share it so everyone cloning or pulling the repo gets it? Are hooks intended to be per machine and not shared?
17:25 Murii joined #git
17:26 gopar joined #git
17:27 Dougie187 hfp: Yes. You'd need another repo for just your hooks, and then clone that into your hooks directory.
17:27 jesst joined #git
17:29 hfp Dougie187: Are git hooks popular at all? Seems like it can't scale at all if it's so manual to propagate them.
17:29 LionsMane joined #git
17:29 Dougie187 Yes they are popular. But you can mess stuff up with the, so it's more a security issue than a scalability issue
17:29 MrWoohoo joined #git
17:30 manuelschneid3r joined #git
17:30 brschaefer joined #git
17:30 govg joined #git
17:31 joshszep joined #git
17:32 kexmex joined #git
17:33 aax joined #git
17:34 dglambert joined #git
17:34 dglambert yo
17:35 qqx hfp: Generally the ones that would need to be replicated since they run on "client" systems are setup to mainly provide niceties. Any real enforcement would be done in a central repo.
17:35 crater2150 joined #git
17:35 guampa joined #git
17:35 planigan joined #git
17:37 unbalancedparen joined #git
17:38 tax joined #git
17:39 Murii joined #git
17:39 xaa__ joined #git
17:40 kristjansson_ joined #git
17:40 Es0teric joined #git
17:41 kristjansson_ joined #git
17:41 Murii joined #git
17:41 nixjdm joined #git
17:43 aviraldg joined #git
17:43 aviraldg joined #git
17:44 kristjansson joined #git
17:44 albel727 joined #git
17:45 tlaxkit joined #git
17:46 Masber_080 joined #git
17:47 Murii joined #git
17:48 chachasmooth joined #git
17:49 diogenese joined #git
17:50 rubyonrailed joined #git
17:52 duderonomy joined #git
17:53 eperez joined #git
17:54 jesst joined #git
17:56 MineCoins joined #git
17:56 chipotle joined #git
17:58 darkmist_ joined #git
17:58 glebihan joined #git
17:59 MattMaker joined #git
17:59 prg3 joined #git
18:00 sparr joined #git
18:01 hfp I see, thanks. I was using them to run linting before pushing because the CI server takes for ever so it's nice to know I have a linting error right away
18:04 qqx hfp: Yes, it's definitely nice to get that notification early. When I've done those types of checks I essentially duplicate doing them on the client and on the server.
18:04 qqx The server rejecting changes that don't pass is then encouragement for people to install the client-side hooks.
18:05 mehola joined #git
18:05 LionsMane joined #git
18:06 hotpancakes joined #git
18:07 chachasmooth joined #git
18:07 Sasazuka joined #git
18:07 hotpanca_ joined #git
18:08 TbobbyZ joined #git
18:08 Murii joined #git
18:11 unbalancedparen joined #git
18:11 Murii joined #git
18:14 Murii joined #git
18:16 darkmist_ joined #git
18:18 Murii joined #git
18:19 theiostream joined #git
18:19 marianina8 joined #git
18:20 synthroi_ joined #git
18:20 pietv joined #git
18:21 hotpancakes joined #git
18:21 peepsalot joined #git
18:22 kegster joined #git
18:22 hotpancakes joined #git
18:23 darkmist_ joined #git
18:25 User458764 joined #git
18:27 hotpancakes joined #git
18:27 ankit01ojha joined #git
18:27 NeXTSUN joined #git
18:28 rivarun joined #git
18:28 DarkPsydeLord joined #git
18:29 cliluw I have two branches. I merged the first branch into the second branch a few days ago and resolved a big merge conflict caused by one of the commits. Today, I am merging the first branch into the second branch again and Git is complaining about the merge conflict that I already resolved before.
18:30 cliluw Am I doing my merge command incorrectly? I do "git merge first_branch".
18:32 theiostream joined #git
18:33 nickel_dime_look joined #git
18:34 nickel_dime_look joined #git
18:35 hotpancakes joined #git
18:35 kristofferR joined #git
18:41 hotpancakes joined #git
18:41 hotpancakes joined #git
18:41 Marumarsu joined #git
18:43 Acerific joined #git
18:43 Acerific joined #git
18:43 ziombelas joined #git
18:44 maks_ joined #git
18:45 digidog joined #git
18:46 ethali joined #git
18:46 orbyt_ joined #git
18:47 re1 joined #git
18:47 parasite_ joined #git
18:48 nexemacs joined #git
18:48 choki joined #git
18:50 MineCoins joined #git
18:50 Ryanar joined #git
19:00 guardian do I have another option than using a clean filter to insert date of commit in a file?
19:00 hotpancakes joined #git
19:02 Murii joined #git
19:03 hahuang61 joined #git
19:04 prg3 joined #git
19:07 perlpilot guardian: make *another* commit to insert the date ;)
19:07 fish3485 joined #git
19:09 queso joined #git
19:10 Doginal joined #git
19:10 cdg joined #git
19:10 battousai joined #git
19:11 queso My coworker pushes a feature branch.  I review it, make suggestions.  He makes changes to his branch and rebases off of master and pushes his feature branch again.  Now I if I compare before and after, I get all the new changes from master, too.  What can I do to see only what he changed between the two feature branch pushes (excluding the newer commits from master)?
19:12 preaction git log origin/master..feature_branch or something
19:12 hotpanca_ joined #git
19:13 Cassiopaya joined #git
19:13 queso That would show me changes between the master branch and the feature branch, which I don't want to see.
19:14 preaction no, that would show you the changes starting at the tip of the master branch between the tip of the feature branch
19:15 SwiftMatt joined #git
19:15 darkmist_ joined #git
19:16 _Vi joined #git
19:17 queso I want the diff of the first feature branch and the second feature branch, minus the new commits from master.
19:17 adirsms52 joined #git
19:18 preaction what second feature branch?
19:19 tyreld joined #git
19:19 preaction as far as git's concerned, the new commits on master were part of the changes made to the feature branch. if you want to filter those out, rebase the branch you're trying to compare with, or look at the log and do it manually
19:20 queso git pull ; git checkout feature ; git checkout -b feature-original ; I review feature branch, he makes changes and rebases off master ; me:  git checkout master ; git branch -d feature ; git pull ; git checkout feature-original ; git diff feature  <-- here I expect to see the differences between his first push and second push, but the rebase messes it up.
19:21 preaction so, like i said, rebase feature
19:22 hhee2 joined #git
19:23 queso so, rebase feature-original up to where the fresh feature branch is rebased to.
19:23 queso that makes sense.
19:24 drodger joined #git
19:31 mikecmpbll joined #git
19:31 Es0teric joined #git
19:40 m0viefreak joined #git
19:47 re1_ joined #git
19:47 el_guapo joined #git
19:52 hotpancakes joined #git
19:53 strk left #git
19:56 pzp joined #git
19:57 durham_ joined #git
19:58 _Vi joined #git
19:59 Starky joined #git
20:00 __builtin joined #git
20:00 jedahan joined #git
20:05 ZyX-I joined #git
20:06 mehola joined #git
20:06 hotpancakes joined #git
20:06 thiago joined #git
20:07 Jackneilll joined #git
20:07 ghoti joined #git
20:11 spm_draget joined #git
20:15 Vortex34 joined #git
20:16 SwiftMatt joined #git
20:17 alexandre9099 joined #git
20:19 dave0x6d joined #git
20:22 kristofferR joined #git
20:24 nowhereman joined #git
20:24 Vortex34 joined #git
20:26 hotpancakes joined #git
20:28 hotpanca_ joined #git
20:29 guardian perlpilot: *cough* -- I wish git went beyond $Id$ and added $Date$, $branch$ etc
20:30 dendazen joined #git
20:32 rosiu joined #git
20:34 borkr joined #git
20:35 _rubik left #git
20:39 star_prone joined #git
20:43 _Vi joined #git
20:44 pietv joined #git
20:44 afuentes joined #git
20:44 hotpancakes joined #git
20:45 cahoots_ joined #git
20:48 theiostream joined #git
20:48 kiltzman joined #git
20:50 acetakwas joined #git
20:51 ohcibi joined #git
20:53 Snugglebash joined #git
20:53 jeffreylevesque joined #git
20:53 Snugglebash joined #git
20:54 bannakaffalatta joined #git
20:56 Es0teric joined #git
20:57 guampa joined #git
20:59 hagridaaron joined #git
21:00 tyreld joined #git
21:02 thebope joined #git
21:03 netj joined #git
21:04 hahuang61 joined #git
21:07 hagridaaron joined #git
21:10 visual joined #git
21:10 visual joined #git
21:14 toothe I am working on some code, but think I approached the problem the wrong way
21:14 toothe rather than throw away all of my existing code, is there a way to save it?
21:14 toothe i want to take my approach in a different direction, but would have to lose it.
21:14 toothe Do I commit it?
21:16 jost_ joined #git
21:17 griff joined #git
21:19 theiostream joined #git
21:21 dsdeiz joined #git
21:21 dsdeiz joined #git
21:21 lavalamp joined #git
21:22 mattcen joined #git
21:27 drodger joined #git
21:29 hotpanca_ joined #git
21:29 star_prone joined #git
21:30 tmg joined #git
21:30 Plippz left #git
21:39 ZeroZeroZeroZero joined #git
21:39 Loomaanaatii joined #git
21:45 ozmage joined #git
21:47 Random832 guardian, $id$ identifies a version of a file, rather than a commit - if you change a file then change it back it will have the same blob hash and therefore the same id
21:50 star_prone joined #git
21:53 YuGiOhJCJ joined #git
21:53 mizu_no_oto joined #git
21:53 alexandre9099 joined #git
21:53 glebihan_ joined #git
22:00 Forlorn joined #git
22:02 hagridaaron joined #git
22:02 el_guapo left #git
22:04 durham joined #git
22:07 rwb joined #git
22:07 madewokherd joined #git
22:07 mehola joined #git
22:11 alexandre9099 joined #git
22:12 futuristic joined #git
22:14 gopar joined #git
22:15 tvw joined #git
22:15 jonez joined #git
22:17 Dougie187 left #git
22:19 tvw joined #git
22:19 hhee2 joined #git
22:21 safe joined #git
22:22 basdb joined #git
22:23 thebope joined #git
22:24 durham joined #git
22:24 prg3 joined #git
22:26 sunrunner20 joined #git
22:26 menip joined #git
22:28 bwn joined #git
22:30 star_prone joined #git
22:32 gopar joined #git
22:32 aspiers joined #git
22:33 gopar joined #git
22:34 dendazen joined #git
22:34 dirtyroshi joined #git
22:34 spm_draget joined #git
22:36 thebope joined #git
22:37 cagomez joined #git
22:37 manuelschneid3r joined #git
22:38 raijin joined #git
22:40 Sasazuka joined #git
22:42 anuxivm joined #git
22:43 orbyt_ joined #git
22:44 thebope_ joined #git
22:46 cagomez_ joined #git
22:47 rubyonrailed joined #git
22:50 cagomez joined #git
22:51 star_prone joined #git
22:57 nemesit|znc joined #git
22:57 snowalpaca joined #git
22:58 spm_draget joined #git
22:59 foreal joined #git
22:59 raijin joined #git
23:00 unreal joined #git
23:00 orbyt_ joined #git
23:01 Darren_ joined #git
23:01 [Brain] joined #git
23:03 Guest55 joined #git
23:05 hahuang61 joined #git
23:05 snowalpaca joined #git
23:07 ZeroZeroZeroZero joined #git
23:07 BlessJah joined #git
23:08 gopar joined #git
23:12 cam27 joined #git
23:14 salamanderrake joined #git
23:14 sbasso joined #git
23:16 pwnz0r joined #git
23:16 hotpancakes joined #git
23:17 agusyc joined #git
23:18 hagridaaron joined #git
23:21 jackhum joined #git
23:24 cagomez_ joined #git
23:30 dostoyevski64 joined #git
23:30 raijin joined #git
23:30 am55 joined #git
23:31 dostoyevski64 left #git
23:32 oskarkv joined #git
23:32 sunrunner20 joined #git
23:33 nexemacs_ joined #git
23:33 Vortex34 joined #git
23:34 gopar joined #git
23:36 basdb joined #git
23:37 hotpancakes joined #git
23:39 kyan joined #git
23:41 snowalpaca joined #git
23:41 snowalpaca joined #git
23:41 dminuoso So I have a repository that is basically being stopped in its tracks and split off into two separate folder structures but still belong together (they form API and web frontend).
23:41 dminuoso How would you manage these so they can still reside in the same gitlab project
23:41 tax left #git
23:42 dminuoso Just a silly and simple /api /backend structure?
23:42 _28_ria joined #git
23:43 holodoc joined #git
23:43 basdb joined #git
23:43 sunrunner20 joined #git
23:44 hhee2 joined #git
23:46 mda1 joined #git
23:47 re1 joined #git
23:48 planigan joined #git
23:49 MistahKurtz joined #git
23:49 hotpanca_ joined #git
23:57 hagridaaron joined #git

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