Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-08

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

All times shown according to UTC.

Time Nick Message
00:00 MattMaker joined #git
00:03 eletuchy joined #git
00:03 rnsanchez_ joined #git
00:05 rominronin joined #git
00:05 knutstrut joined #git
00:05 IWishIKnew joined #git
00:06 eletuchy_ joined #git
00:08 eletuch__ joined #git
00:10 fission6 joined #git
00:11 eletuchy joined #git
00:11 Vinnie_win joined #git
00:13 eletuchy_ joined #git
00:14 EvilPenguin joined #git
00:14 tax joined #git
00:15 livingstn joined #git
00:15 texinwien joined #git
00:15 raijin joined #git
00:19 eletuchy joined #git
00:19 CEnnis91 joined #git
00:21 eletuch__ joined #git
00:23 JanC_ joined #git
00:24 eletuchy joined #git
00:25 qpdb joined #git
00:25 mmlb joined #git
00:25 rkazak joined #git
00:27 eletuchy_ joined #git
00:27 gp5st joined #git
00:28 Guest55 joined #git
00:28 fuchstronaut joined #git
00:30 eletuchy joined #git
00:32 Khisanth joined #git
00:32 shgysk8zer0 joined #git
00:32 drodger joined #git
00:32 eletuch__ joined #git
00:33 cdg joined #git
00:35 eletuchy joined #git
00:36 interne7y joined #git
00:37 githogori joined #git
00:40 Kaisyu joined #git
00:40 livingstn joined #git
00:41 allcentu1 joined #git
00:42 Khisanth joined #git
00:42 adambrenecki_ joined #git
00:43 adambrenecki joined #git
00:44 boudicca joined #git
00:46 gp5st left #git
00:46 wxg joined #git
00:47 barteks2x What exactly does "^M" at the end of newly added line in got diff mean?
00:47 barteks2x *git diff
00:50 barteks2x I know it means that I have issues with line endings, but what exactly? I need to know to know which program blame for it
00:52 Schwarzbaer_ joined #git
00:53 preaction it's a \r, which windows uses as part of its line-ending
00:55 _vyscond joined #git
00:55 nilsi joined #git
00:55 barteks2x and if it's red in the console, does it mean it's removed?
00:55 jaguarmagenta joined #git
00:56 fission6 joined #git
00:57 Tanger joined #git
00:57 eletuchy joined #git
00:58 preaction what's red? red in what?
01:01 rgrinberg joined #git
01:02 harmfulbytes joined #git
01:02 barteks2x preaction, like this: http://i.imgur.com/ciPeFUG.png
01:03 preaction no, it doesn't mean it's removed. whatever is displaying that diff is highlighting it as something you likely want to remove
01:04 BombStrike joined #git
01:04 barteks2x ah, so currently there are windows line endings in this file, and they are not being changed?
01:04 preaction something has added windows line endings, yes
01:06 rominronin joined #git
01:06 barteks2x so these line endings are only in this one place, or in the whole file?
01:07 checkItOut joined #git
01:07 barteks2x If they are only here, then my IDE messed it up
01:08 preaction the diff seems to look like they're only in these new lines
01:09 moei joined #git
01:09 Noldorin joined #git
01:14 edude03 joined #git
01:15 Nikesh joined #git
01:16 Nikesh Given a commit history like (descending) abc123, def456, ghi789 - how can I make a small change to commit ghi789 and replay the changes from the later/newer commits?
01:17 Eugene Nikesh - !sausage is a good read; tl;dr run `git rebase -i` and "edit" ghi789
01:17 gitinfo Nikesh: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.c​om/GitBestPractices/#sausage and !perfect
01:17 boudicca joined #git
01:17 drodger joined #git
01:18 fscala joined #git
01:19 linuxmint joined #git
01:21 ahr3n joined #git
01:22 boudiccas joined #git
01:22 Nikesh Eugene: I keep getting caught in merge conflicts and then end up applying a new commit after abc123
01:22 livingstn joined #git
01:22 fstd joined #git
01:22 Eugene What are you rebasing-against? !lol is helpful
01:22 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
01:23 scorphus joined #git
01:24 Nikesh Eugene: I'm rebasing against the parent commit
01:25 MattMaker joined #git
01:25 pks joined #git
01:25 Nikesh i.e. `git rebase -i ghi789^`
01:25 Eugene Sounds like you might just need to resolve the conflict manually then
01:26 eletuchy_ joined #git
01:26 watabou joined #git
01:27 drodger joined #git
01:27 Nikesh Hm yeah, I guess I'm confused because I resolve it manually,
01:27 Nikesh but then it just applies the commit after abc123
01:27 interne7y joined #git
01:28 scorphus joined #git
01:28 Eugene Is there a merge involved?
01:28 Sareuon joined #git
01:29 rkazak joined #git
01:30 eletuchy joined #git
01:31 msonntag joined #git
01:32 sbeller_ joined #git
01:33 eletuchy_ joined #git
01:35 dermoth joined #git
01:36 eletuchy joined #git
01:37 sioseal joined #git
01:38 eletuch__ joined #git
01:38 the_cybersphinx joined #git
01:40 livingstn joined #git
01:40 ensyde__ joined #git
01:41 eletuchy joined #git
01:46 ensyde joined #git
01:46 scorphus joined #git
01:46 orbyt_ joined #git
01:46 boudicca joined #git
01:46 eletuchy_ joined #git
01:46 raijin joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and hostage situations | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | I will be executing hostages until there are more https://madeitwor.se/git-jokes
01:50 eletuchy_ joined #git
01:52 dsantiago joined #git
01:54 eletuchy joined #git
01:55 thiago_ joined #git
01:57 edude03 joined #git
01:57 eletuchy_ joined #git
01:59 dsantiago joined #git
02:00 eletuchy joined #git
02:03 grawity joined #git
02:03 _rnsanchez_ joined #git
02:03 Rodya_ joined #git
02:03 eletuchy_ joined #git
02:03 msonntag joined #git
02:05 MattMaker joined #git
02:06 dreiss joined #git
02:06 eletuchy joined #git
02:07 rominronin joined #git
02:08 checkItOut_ joined #git
02:09 checkItOut_ joined #git
02:09 eletuchy_ joined #git
02:10 checkItOut_ joined #git
02:11 fahadash joined #git
02:12 eletuchy joined #git
02:12 checkItOut joined #git
02:13 eletuch__ joined #git
02:15 checkItO1t joined #git
02:15 ajf- joined #git
02:17 eletuchy joined #git
02:18 eletuchy_ joined #git
02:20 eletuch__ joined #git
02:21 the_cybersphinx joined #git
02:21 franl joined #git
02:23 wald joined #git
02:24 DolpheenDream left #git
02:24 eletuchy joined #git
02:26 _habnabit joined #git
02:26 eletuchy_ joined #git
02:28 _habnabit grumble grumble. git-annex doesn't preserve if a file is executable in its metadata, so doing a sync from a url means that whatever it was you had will no longer be executable. any alternatives to git-annex (all i need is large files stored out-of-line) or potential workarounds?
02:28 skylite joined #git
02:28 dreiss joined #git
02:30 eletuchy joined #git
02:33 cdg joined #git
02:33 eletuchy_ joined #git
02:33 ISmithers joined #git
02:33 ISmithers Hi all, when cloning a repository is it possible for me to set the remote to a specific URI?
02:33 MattMaker joined #git
02:34 dmto joined #git
02:34 ISmithers For example I may clone from https including user credentials, but want my origin remote to not include those in the URI
02:35 eletuch__ joined #git
02:36 justanot1eruser joined #git
02:37 eletuchy joined #git
02:37 david007 joined #git
02:40 eletuchy_ joined #git
02:41 santa-fire joined #git
02:43 eletuchy joined #git
02:44 pelegreno joined #git
02:46 dmto joined #git
02:46 eletuchy_ joined #git
02:47 preaction clone without the credentials. it should ask for them. otherwise, do git remote set-url after you clone
02:47 A124 joined #git
02:48 Goplat joined #git
02:48 assgrass joined #git
02:49 ISmithers I am writing a script to clone around 30 repositories for a new machine setup. I don't want to enter my password 30 times preaction
02:49 preaction i did say "otherwise"
02:49 assgrass joined #git
02:50 ISmithers Yeah I was contemplating that, I was hoping for something potentially built-in.
02:50 ISmithers I was looking at credential cache too.
02:50 preaction or a .netrc file?
02:50 edude03 joined #git
02:51 eletuchy joined #git
02:51 grassazz joined #git
02:51 preaction git's just using curl, it sees a url, so it can't really do anything with it
02:52 ISmithers I think set-url is going to be the way.
02:52 ISmithers Requires minimal setup from end-users.
02:52 ISmithers I can just write it into the script
02:52 eletuch__ joined #git
02:53 syg_ joined #git
02:54 eletuchy_ joined #git
02:56 jaguarmagenta joined #git
02:56 A124 ISmithers https://help.github.com/articles/ca​ching-your-github-password-in-git/
02:58 woodruffw joined #git
02:58 ISmithers Thanks A124. I have installed the windows git credential manager, but I think I'm running into issues as I'm configuring a grunt project to handle this, include prompts and multiple shell commands.
02:58 eletuchy joined #git
02:58 chachasmooth joined #git
02:59 A124 Well, that is different path. But if you are using git underneath, this would do.
02:59 ISmithers Yeah I am using git underneath, just got to get it all working together. :)
03:00 interne7y joined #git
03:00 hexagoxel joined #git
03:01 eletuchy_ joined #git
03:01 Mateo_W joined #git
03:03 eletuch__ joined #git
03:04 aavrug joined #git
03:05 eletuchy joined #git
03:05 aavrug joined #git
03:08 rominronin joined #git
03:09 ShekharReddy joined #git
03:10 eletuchy_ joined #git
03:11 MattMake_ joined #git
03:13 eletuchy joined #git
03:13 ISmithers So weird, it provides an input for my password, but when I enter it I see the characters. After pressing enter it carriage returns and nothing happens, I then need to enter the password again which does hide the characters as normal and it accepts it.
03:15 eletuch__ joined #git
03:15 romerocesar joined #git
03:16 dalias i'm looking for a way to use signed commits/tags without running git and doing my development on a box that has private keys
03:16 dalias i want to use gpg.program git-config item to run a script that ssh's to the signing server
03:17 preaction ISmithers: likely because whatever you're using to run git is taking control of the terminal and/or not letting the credential-gathering-thing get at it
03:17 dalias however because git is using stdin/out for the data, ssh doesn't have a pty to enter the gpg passphrase on
03:18 ISmithers preaction: Yeah this is my thinking. Is there a way to get Git to prompt for credentials before cloning a repo? Like, asking it to test the connection or configure credentials first?
03:18 eletuchy joined #git
03:18 preaction not that i'm aware of. git asks libcurl to do its thing and it does
03:19 toogley joined #git
03:20 k3rn31 joined #git
03:21 eletuchy_ joined #git
03:21 wloncom joined #git
03:24 eletuchy joined #git
03:26 eletuch__ joined #git
03:27 SwiftMatt joined #git
03:28 grassaSS joined #git
03:28 eletuchy_ joined #git
03:29 ISmithers I give in, I will change the remote-url after each clone. Bleh
03:31 eletuchy joined #git
03:33 drodger joined #git
03:35 eletuchy_ joined #git
03:35 pmort joined #git
03:37 mizu_no_oto joined #git
03:38 eletuchy joined #git
03:38 mehola joined #git
03:40 Nikesh joined #git
03:40 eletuch__ joined #git
03:42 eletuchy_ joined #git
03:44 eletuchy joined #git
03:46 dmto joined #git
03:46 d4rklit3 joined #git
03:47 eletuchy_ joined #git
03:47 drodger joined #git
03:48 wxg joined #git
03:49 eletuch__ joined #git
03:52 eletuchy joined #git
03:56 eletuchy_ joined #git
03:56 ccolorado joined #git
03:59 T4nkAbb0t joined #git
03:59 ahr3n_ joined #git
04:00 Gsham joined #git
04:00 robotroll joined #git
04:00 eletuchy joined #git
04:00 dsantiago joined #git
04:00 dreiss joined #git
04:02 rkazak joined #git
04:02 eletuch__ joined #git
04:05 eletuchy_ joined #git
04:08 eletuchy joined #git
04:09 rominronin joined #git
04:10 eletuch__ joined #git
04:11 _habnabit left #git
04:13 hahuang61 joined #git
04:14 eletuchy joined #git
04:15 josuebrunel joined #git
04:17 eletuchy_ joined #git
04:17 faux___ joined #git
04:18 mehola joined #git
04:19 eletuch__ joined #git
04:19 hahuang61 joined #git
04:21 eletuchy joined #git
04:21 Cabanossi joined #git
04:22 dmto joined #git
04:24 ccolorado left #git
04:24 armyriad joined #git
04:25 eletuchy_ joined #git
04:28 eletuchy joined #git
04:30 Ragnor joined #git
04:30 eletuch__ joined #git
04:30 fuchstronaut joined #git
04:31 romerocesar joined #git
04:32 dmto joined #git
04:32 variable joined #git
04:33 bilb_ono joined #git
04:33 eletuchy joined #git
04:35 eletuchy_ joined #git
04:37 eletuch__ joined #git
04:39 wxg joined #git
04:40 eletuchy joined #git
04:43 faux___ joined #git
04:43 eletuchy_ joined #git
04:46 fracting joined #git
04:46 eletuchy joined #git
04:47 drodger joined #git
04:47 zifnab was kicked by Eugene: YOU MUST SUBMIT ADDITIONAL JOKES
04:48 zifnab joined #git
04:48 eletuch__ joined #git
04:51 dsantiago joined #git
04:51 eletuchy joined #git
04:54 santa-fire joined #git
04:55 eletuchy_ joined #git
04:55 Raging_Hog joined #git
04:56 nivag joined #git
04:56 santa-fire joined #git
04:57 subhojit777 joined #git
04:57 eletuch__ joined #git
04:57 jaguarmagenta joined #git
04:59 Mobutils joined #git
04:59 eletuchy joined #git
05:00 drodger joined #git
05:02 eletuchy_ joined #git
05:04 eletuch__ joined #git
05:06 eletuchy joined #git
05:06 cqi joined #git
05:07 cqi does git distinguish different errors by different return codes?
05:09 eletuchy_ joined #git
05:10 mehola joined #git
05:10 rominronin joined #git
05:11 eletuch__ joined #git
05:12 settermjd joined #git
05:12 pwnz0r joined #git
05:13 shafox joined #git
05:14 eletuchy joined #git
05:16 eletuchy_ joined #git
05:18 eletuch__ joined #git
05:19 diogenese joined #git
05:21 eletuchy joined #git
05:22 sauvin joined #git
05:24 eletuchy_ joined #git
05:26 eletuch__ joined #git
05:27 interne7y joined #git
05:27 drodger joined #git
05:27 eletuchy joined #git
05:28 tinajohnson___ joined #git
05:28 dfr33zy joined #git
05:30 fscala joined #git
05:31 dlab joined #git
05:32 apotry joined #git
05:32 rominronin joined #git
05:40 romerocesar joined #git
05:45 ochorocho__ joined #git
05:47 ThomasLocke joined #git
05:48 a_thakur joined #git
05:49 ahr3n joined #git
05:49 MattMaker joined #git
05:51 drodger joined #git
05:52 exxit joined #git
05:52 exxit i have delete a file , now even after a push shows delete filename..
05:52 exxit how can i remove it from git status ?
05:52 kadoban exxit: Did you commit the deletion? Do you want to?
05:53 kadoban push doesn't really have anything to do with status, by the way.
05:53 exxit kadoban: yeah
05:53 exxit i did commited the deletion
05:54 thibaultcha left #git
05:54 exxit it tells me that..
05:54 kadoban exxit: And git status shows what? Did you add it to .gitignore, or some other exclusion/ignore mechanism?
05:54 exxit 'git checkout -- <file>... " to discard changes in working directory
05:54 exxit kadoban: no didn't add it to exclusion/ignore mechanism.
05:55 kadoban exxit: I don't really understand what it's saying changed, that's just the "helpful" part of status's output, not what it's saying changed.
05:55 exxit Changes not staged for commit:   (use "git add/rm <file>..." to update what will be committed)   (use "git checkout -- <file>..." to discard changes in working directory)
05:55 exxit that's what git status shows
05:55 kadoban That's not all that it shows.
05:56 stuh84 joined #git
05:56 exxit https://bpaste.net/show/8640c9c22561
05:57 kadoban exxit: Doesn't look like you commited the deletion. It's still showing it as a file that's been deleted but not been staged or commited.
05:58 kadoban exxit: 'git rm ../demo' and then commit. Then if you want, add it to an ignore mechanism, depends what you're trying to do.
05:59 qt-x joined #git
06:00 exxit kadoban: that helped..
06:00 exxit thanks mate
06:00 kadoban 'welcome
06:01 exxit kadoban: one thing i didn't understand is that why did it showed as ../demo instead of just demo ?
06:01 exxit because this file was in current directory
06:02 kadoban exxit: It's relative to wherever you were when you were running 'git status' maybe you had two of them?
06:05 yuhlw joined #git
06:07 realz joined #git
06:07 shgysk8zer0 joined #git
06:08 rscata joined #git
06:09 exxit kadoban: maybe  i have no idea about it now..
06:10 Wulf joined #git
06:10 Wulf Hi
06:10 Wulf What's the command to get the commit hash from the latest commit to the current directory?
06:11 cyan__ joined #git
06:12 Wulf i.e. some nicer version of:  git log . | grep ^commit | head -n 1
06:13 a_thakur joined #git
06:13 t0by joined #git
06:13 LaT0rtue joined #git
06:15 fracting joined #git
06:16 zeroed joined #git
06:16 zeroed joined #git
06:16 lamppid joined #git
06:17 lolmac joined #git
06:17 muthu joined #git
06:17 Repox joined #git
06:20 nilsi_ joined #git
06:22 Mobutils joined #git
06:22 dopesong joined #git
06:25 osse Wulf: git log --format=%H -1 -- .
06:26 Wulf osse: thank you!
06:26 dopesong joined #git
06:26 endiruna joined #git
06:28 interne7y joined #git
06:29 freimatz joined #git
06:29 gsingh joined #git
06:30 gsingh left #git
06:30 jagob joined #git
06:31 Fijit joined #git
06:32 pungi-man joined #git
06:34 syg_ joined #git
06:34 boudiccas joined #git
06:36 Alienpruts joined #git
06:39 helpD joined #git
06:40 helpD Hello guys
06:40 Wulf hi D
06:41 helpD please, i am working on a git branch and I need to save all changes to it so I could checkout to a different branch, can I use git commit without pushing this upstream?
06:41 Wulf "git push" pushes, "git commit" does not push.
06:41 helpD the goal is , I will still have to come back to that branch and I don't want other developers to pull it as the work is still ongoing
06:42 Wulf are they pulling from *your* computer?
06:42 helpD Wulf: no, they are pulling from a central repository
06:42 Zarthus helpD: temporarily push it to a different branch?
06:42 helpD my branch is locally on my machine
06:42 Wulf helpD: as long as you don't push to it, they can't see it
06:42 helpD Zarthus: it is already on a branch. the branch is different from the main develop branch.
06:43 Zarthus you can branch off further; that's not a worry. If you still want your chances on the remote without interfering with existing development it's a good choice. If you don't want things on the remote at all Wulf's advice has you covered.
06:43 Zarthus changes*
06:43 helpD Wulf: so, I git commit and then checkout to another branch. say 2 hours later, I checkout to the previous branch I committed, will my changes committed still be visible in the branch?
06:44 eletuchy joined #git
06:44 helpD Wulf: I do know git stash does this but I don't want to stash it. I want to somehow save it and can refer to any changes made in that branch when I checkout to it again. Just like one does in 'stashing'
06:44 Wulf helpD: yes, of course
06:44 ISmithers It would be scary to live in a world where they would just disappear for some reason lol
06:45 Wulf helpD: commits don't magically disappear from a branch...
06:45 elastix joined #git
06:45 Wulf ISmithers: yes, it is. Happened to me.
06:45 helpD ISmithers: lol. i just need to be sure as I have made alot of changes to the branch . the thought of everything going or someone else seeing it as I am still working on it is scarry
06:45 ochorocho__ joined #git
06:46 Zarthus then i'd follow my advice and just put it on the remote elsewhere
06:46 Wulf helpD: if in doubt, you can always create a full copy of your repository
06:46 Zarthus in the event of your computer catching fire your changes would still be on the server.
06:46 helpD Wulf: that might help but what really is the different between git stash and git commit?
06:47 helpD Wulf: what i want to do with git commit is exactly what git stash does. with git stash, I can always come back to my changes.
06:47 helpD Zarthus: lol. that is stretching it far off
06:47 Zarthus gotta cover your bases 8)
06:48 boingy joined #git
06:48 TomyWork joined #git
06:50 Rish joined #git
06:50 helpD left #git
06:51 boudicca joined #git
06:51 Sceorem joined #git
06:53 zincrokx joined #git
06:54 jknetl joined #git
06:54 Lynxium joined #git
06:54 gsingh joined #git
06:56 encod3 joined #git
06:57 Dazzyp joined #git
06:57 k3rn31 joined #git
06:58 jaguarmagenta joined #git
06:59 gsingh joined #git
07:00 xbob joined #git
07:01 dsantiago joined #git
07:01 boudiccas joined #git
07:03 LJHSLDJHSDLJH joined #git
07:04 LJHSLDJHSDLJH Hi, I'm wondering if git does any real changes on the working directory files or it just track their actions! can anyone tell?
07:04 Wulf WERTZUJFNZTEFUNJ: Of course it changes the working dir.
07:04 kadoban LJHSLDJHSDLJH: It will change files if you tell it to of course. I'm not sure what you mean.
07:05 kadoban If all you ever do is commit, it doesn't change any files except in .git/ I guess?
07:05 LJHSLDJHSDLJH one more thing is the exact difference between git reset --soft/hard HEAD^
07:05 Wulf hard changes working dir, soft does not
07:05 LJHSLDJHSDLJH they both undo the last commit but one put back into staging!! I don't understand that
07:05 SoRoot joined #git
07:06 xorox90 joined #git
07:06 dreiss joined #git
07:06 LJHSLDJHSDLJH ok say I have a repo of 5 commits and I want to completely go back to second commit in history and blowout all last three changes... how to do that?
07:08 circ-user-WUSoW joined #git
07:09 bilb_ono joined #git
07:10 josuebrunel joined #git
07:11 LJHSLDJHSDLJH joined #git
07:11 t0by joined #git
07:11 pungi-man LJHSLDJHSDLJH, git reset --hard HEAD~2
07:12 pungi-man That would *completely* blow out the changes
07:12 LJHSLDJHSDLJH is HEAD~2 equivalent to HEAD^^ ?
07:12 moei joined #git
07:13 kadoban Yes
07:13 LJHSLDJHSDLJH thank you
07:13 PCatinean joined #git
07:14 LJHSLDJHSDLJH I will test it on my experimental repo
07:14 harish joined #git
07:15 JeroenT joined #git
07:16 gsingh left #git
07:16 emPi joined #git
07:18 bittin joined #git
07:21 LJHSLDJHSDLJH works like magic .. now I'm trying this remove command but it's not working git rm -rf *
07:23 stonerfish joined #git
07:24 Psychiatrist joined #git
07:24 jceb joined #git
07:25 fees joined #git
07:26 esc joined #git
07:28 checkItOut joined #git
07:28 Macaveli joined #git
07:28 eijk_ joined #git
07:28 interne7y joined #git
07:31 pratima joined #git
07:32 eletuchy joined #git
07:34 ahmedelgabri joined #git
07:34 a_thakur joined #git
07:34 interne7y joined #git
07:35 boz_v1 Hi, is it ok to use repository clone done with lower version of git with the greater version one?
07:35 jast yes
07:36 drodger joined #git
07:36 boz_v1 ok, thanks jast
07:36 jast sometimes major releases mean you can't use new repositories with an older git, but old repo with new git is always possible
07:37 Stummi how do I remove the deletion of a file from the index?
07:37 jast (I don't think that has actually even happened so far)
07:37 snfgf joined #git
07:37 jast Stummi: 'git status' gives you hints about stuff like that. to get back the version in the last commit, 'git reset -- <file>'
07:37 cdown_ joined #git
07:38 boudiccas joined #git
07:40 pratima Hi There
07:40 gitinfo pratima: 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:40 jast hi :)
07:41 pratima :-)
07:41 pratima Need small clarification on git pre-commit hooks implementation
07:41 jast first time on IRC can be a little tricky, but now you've got it
07:41 jast okay, what do you want to know?
07:41 pratima I have a project where I have successfully implemented pre-commit hook and tested it in git bash
07:42 pratima but now my developers started using Jdeveloper and they are using team plugin in jdev to do git operations right from git clone
07:42 pratima pre-commit hook is not being triggered when using jdev -> team-> git ->commit
07:43 pratima I have ensured that my  pre-commit file is in .git/hooks folder
07:43 jast yeah, and it needs to be marked executable, too
07:43 pratima does IDEs have special configuration  to make for pre-commit hooks
07:44 pratima you mean file permissions ?
07:44 jast I don't know JDeveloper specifically, but some git plugins don't actually use the official git client and have their own implementation which may not support hooks at all
07:44 jast yes
07:45 a_thakur joined #git
07:45 pratima $ ls -ltr total 16 -rwxr-xr-x 1 pmangena 1049089 16252 Jun  8 11:55 pre-commit*
07:46 jast that looks good
07:46 pratima permissions seems to be fine
07:46 GavinMagnus joined #git
07:46 pratima :-( this scares me
07:47 pratima I have to restrict them committing code with out copyright information
07:47 nnyk_ joined #git
07:48 keltvek joined #git
07:48 jast well, as I said, I don't really know JDeveloper. you could ask the developers of the team plugin what they know about support for hooks like pre-commit
07:49 jast worst case: it's not supported at all, then if you can't teach your developers to commit properly you might have to set up a way to only allow reviewed commits in the repository
07:49 watabou joined #git
07:50 JeroenT joined #git
07:53 eijk joined #git
07:55 eletuchy joined #git
07:55 JeroenT joined #git
07:57 eijk_ joined #git
08:00 apotry joined #git
08:01 JeroenT joined #git
08:01 fracting joined #git
08:02 eijk_ joined #git
08:02 _rgn joined #git
08:02 _rgn joined #git
08:03 blur3d joined #git
08:03 bongjovi joined #git
08:04 boudicca joined #git
08:04 _rgn joined #git
08:04 eletuchy joined #git
08:05 garethdaine joined #git
08:05 emx joined #git
08:05 emx what is the easiest way to undo a pushed merge?
08:05 comps joined #git
08:05 emx is it only possible with "git revert -m 1/2 hash"?
08:08 mikecmpbll joined #git
08:09 knutstrut joined #git
08:11 _pix joined #git
08:12 b1tchcakes joined #git
08:12 marcogmonteiro joined #git
08:16 bilb_ono joined #git
08:17 MrWoohoo joined #git
08:18 eijk_ joined #git
08:19 kurkale6ka joined #git
08:19 guardianJ joined #git
08:20 MattMaker joined #git
08:23 monoxane joined #git
08:25 dskfldm joined #git
08:26 dskfldm Hello
08:26 gitinfo dskfldm: 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.
08:27 dskfldm !backup
08:27 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.c​om/GitBestPractices/#backups
08:31 a_thakur joined #git
08:31 moei joined #git
08:32 fuchstronaut joined #git
08:32 LJHSLDJHSDLJH how can I undo git add --all
08:32 lb LJHSLDJHSDLJH git reset
08:33 qt-x joined #git
08:34 LJHSLDJHSDLJH that works ... thanks
08:34 lb you're welcome
08:35 kedare joined #git
08:35 encod3_ joined #git
08:35 courrier joined #git
08:35 Silenced_v2 joined #git
08:36 Wulf How can I get the path of the current directory relative to the git repo's root, and the name of the repository?
08:36 guardianJ left #git
08:36 dsop joined #git
08:37 JeroenT joined #git
08:37 ecraven is there a name for the thing you put after git checkout <here>? it can be a branch, or a tag, as far as I understand. any common word for branch-or-tag?
08:37 ecraven or even branch-or-tag-or-commit
08:37 cxz joined #git
08:38 lb ecraven "commitish" anything that git can break down to a commit object
08:39 lb ecraven https://www.kernel.org/pub/software/s​cm/git/docs/#_identifier_terminology
08:39 reactormonk left #git
08:40 ecraven lb: thanks!
08:40 fahadash joined #git
08:41 hexafluoride joined #git
08:42 hexafluoride okay, so I added and deleted some files before ever doing a git add or git commit
08:42 ecraven one more question, I want to reorder some stuff around, how can I check out the content of branch <a>'s HEAD into my current branch?
08:42 hexafluoride but when I do a git status or git diff, they show up as a "deleted" change
08:42 hexafluoride even though they were never staged or committed in the first place
08:42 hexafluoride how do I fix that?
08:42 checkItOut joined #git
08:43 lindenle joined #git
08:43 linuxmodder joined #git
08:44 dopesong joined #git
08:44 lb ecraven reorder in terms of "moving commits around in the history" or do you really just want to checkout the content of branch a into your current workdir ?
08:44 dskfldm I was working on a branch, then i had to fix something, so i did a git stash, then checked out into master branch, did the fix while on the master branch, commit, and now i want to get back. I also need the changes from master, so do i checkout the branch where i did the git stash and pop it then merge, or do i merge from master before then pop the stash
08:44 lb hexafluoride not possible. if they are shown as changed, they are tracked. otherwise the status would be untracked
08:45 lb hexafluoride you can examin the commits with git log -- filename
08:45 dskfldm or is it the same thing
08:45 hexafluoride oh, apparently monodevelop did it for me
08:45 hexafluoride thanks
08:45 hexafluoride I did a git rm
08:45 lb dskfldm basically the same thing
08:46 dskfldm it figures
08:46 josuebrunel joined #git
08:46 lb dskfldm only the part where you might get conflicts change
08:47 Schwarzbaer joined #git
08:47 dskfldm i might have conflicts.. i don't know, i did not do it
08:47 lb if the things from the stash and the new stuff from master does have conflicts
08:47 ecraven lb: just check it out into the working directory, but without leaving my current branch
08:47 ecraven lb: something easier than git archive <a> | tar ...
08:48 lb ecraven git checkout <branch-a> -- .
08:48 lb ecraven git checkout <branch-a> -- file or path
08:48 lb dskfldm maybe do just git stash apply instad of pop
08:49 tvw joined #git
08:49 ecraven lb: wow, thank you!
08:49 dskfldm how is that, are you saying that the order of doing thing matter when there are conflicts? like merge from master then pop vs pop then merge ?
08:49 ecraven lb: never thought it would be this easy :D
08:49 fuchstronaut joined #git
08:49 fuchstronaut joined #git
08:49 lb dskfldm that way you can go back if any conflict and you always have your stash for a second try ;)
08:49 dskfldm well i guess now i need to read about git stash apply..
08:49 lb dskfldm it just changing the view. the conflicts ( if there are any ) thay the same of course.
08:50 lb dskfldm stash pop = stash apply + stash drop
08:50 lb apply from stash to current workdir + drop the stash info
08:50 lb just do the apply part and drop the stash later if you dont need it any longer
08:50 dskfldm oh, so i lose the stash after pop
08:50 dskfldm got it
08:50 dskfldm thanks
08:50 lb thats what pop does ;)
08:51 texinwien joined #git
08:51 lb dskfldm ( you dont really loose it because of the reflog but it's easier that way :) )
08:51 Orbitrix joined #git
08:53 barteks2x joined #git
08:53 bruce_lee joined #git
08:53 bruce_lee joined #git
08:55 sparetire joined #git
08:55 jab416171 joined #git
08:56 JeroenT joined #git
08:56 nuck joined #git
08:57 MattMaker joined #git
08:58 lolmac joined #git
08:58 djb-irc joined #git
08:58 jaguarmagenta joined #git
09:00 paul424 joined #git
09:01 romerocesar joined #git
09:04 cdown joined #git
09:06 troulouliou_div2 joined #git
09:07 Guest53386 joined #git
09:08 SoRoot joined #git
09:09 jceb joined #git
09:10 SoRoot joined #git
09:10 Silenced_v2 joined #git
09:11 Guest53386 left #git
09:11 lolmac joined #git
09:12 ocbtec joined #git
09:13 cdown_ joined #git
09:14 SoRoot joined #git
09:14 King_Hual joined #git
09:14 SoRoot joined #git
09:16 SoRoot joined #git
09:17 jknetl joined #git
09:18 Jellyg00se joined #git
09:18 isxek joined #git
09:19 notebox joined #git
09:22 CheckDavid joined #git
09:24 morrolan1 joined #git
09:24 diogenese joined #git
09:24 neps joined #git
09:26 Rish joined #git
09:27 Macaveli joined #git
09:27 mdw joined #git
09:27 dsdeiz joined #git
09:30 dopesong joined #git
09:32 romerocesar joined #git
09:33 PHPanos joined #git
09:33 a3Dman joined #git
09:33 PHPanos hello
09:34 acetakwas joined #git
09:34 PHPanos I have a feature branch which contains some commits I don't want into the master branch. So I was thinking I could cherry pick the commits I wanted into the master branch, but not all commits are getting through. Any idea?
09:37 rolha joined #git
09:37 acetakwas joined #git
09:37 joki joined #git
09:38 discopatrick joined #git
09:38 zincrokx joined #git
09:39 eletuchy joined #git
09:39 zincrokx joined #git
09:39 settermjd joined #git
09:40 acetakwas joined #git
09:42 acetakwas joined #git
09:43 texinwien joined #git
09:43 fscala joined #git
09:43 acetakwas joined #git
09:45 acetakwas joined #git
09:47 boudiccas joined #git
09:47 pol123456 joined #git
09:47 jceb joined #git
09:47 acetakwas joined #git
09:47 mischat joined #git
09:48 neps joined #git
09:48 Psychiatrist joined #git
09:49 mdw_ joined #git
09:49 mohabaks joined #git
09:50 mdw__ joined #git
09:51 allcentu1 joined #git
09:51 Fr4n joined #git
09:52 Guest23290 joined #git
09:52 Jellyg00se joined #git
09:53 leeN joined #git
09:53 jceb joined #git
09:54 PHPanos Anyone?
09:57 isxek joined #git
09:58 fuchstronaut joined #git
10:03 settermjd joined #git
10:03 mdw joined #git
10:04 qt-x joined #git
10:07 Darcidride joined #git
10:09 jceb joined #git
10:10 cdown joined #git
10:10 piling_ joined #git
10:14 garethdaine joined #git
10:17 mdw joined #git
10:18 WayToDoor joined #git
10:19 fracting joined #git
10:19 qt-x joined #git
10:19 gechr joined #git
10:22 SoRoot joined #git
10:23 AlexRussia joined #git
10:28 FunkyAss joined #git
10:29 acetakwas joined #git
10:32 acetakwas joined #git
10:33 watabou joined #git
10:35 eletuchy joined #git
10:36 wrouesnel joined #git
10:37 encod3 joined #git
10:38 neps joined #git
10:39 interne7y joined #git
10:39 acetakwas joined #git
10:39 jtkovf joined #git
10:39 bollullera joined #git
10:40 iota_pi joined #git
10:41 JeroenT joined #git
10:42 moop joined #git
10:43 tlaxkit joined #git
10:44 rnsanchez_ joined #git
10:45 EduardoMartins joined #git
10:45 iLembus joined #git
10:46 boudiccas joined #git
10:47 LJHSLDJHSDLJH joined #git
10:47 Kaisyu joined #git
10:47 sostenuto joined #git
10:48 LJHSLDJHSDLJH what is the difference between git diff HEAD~3 ..HEAD~2 and git diff HEAD~3..HEAD~2  , I'm not able to comperhend the difference of the output
10:48 subhojit777 joined #git
10:50 acetakwas joined #git
10:52 CussBot joined #git
10:52 boudicca joined #git
10:53 Kurvivor joined #git
10:53 Kurvivor good evening
10:53 Kurvivor i have a problem with remote repository (actually - local, mounted in my /mnt subdirectory)
10:54 Kurvivor it goes like this: i can run git remote show, git pull with it
10:54 son joined #git
10:54 Kurvivor however when i try to push, i get "fatal ... does not appear to be a git repository"
10:54 fission6 joined #git
10:56 Lunatrius joined #git
10:57 PCatinean joined #git
10:57 Kurvivor oh, it seems root did not have access rights there somehow
10:57 Kurvivor sorry for bothering
11:01 fracting joined #git
11:01 le-idiot joined #git
11:01 variable joined #git
11:01 mdw joined #git
11:08 _rnsanchez_ joined #git
11:09 PHPanos joined #git
11:12 raijin joined #git
11:13 subhojit777 joined #git
11:13 neps joined #git
11:15 boudiccas joined #git
11:17 mohabaks joined #git
11:17 k3rn31 joined #git
11:18 garethdaine joined #git
11:19 boudicca joined #git
11:20 dsdeiz joined #git
11:20 dsdeiz joined #git
11:24 LaT0rtue joined #git
11:28 texinwien joined #git
11:28 espindola joined #git
11:30 eletuchy joined #git
11:30 netcarver joined #git
11:30 Sendoushi joined #git
11:32 k3rn31 joined #git
11:34 watabou joined #git
11:39 sioseal joined #git
11:41 circ-user-MwZ8X joined #git
11:42 mdw_ joined #git
11:43 edude03 joined #git
11:43 _pix joined #git
11:45 raijin joined #git
11:45 pungi-man joined #git
11:48 Rooxo joined #git
11:50 johnmilton joined #git
11:50 sdothum joined #git
11:55 Macaveli joined #git
11:56 nanga joined #git
11:56 nanga joined #git
11:57 SimonNa joined #git
11:59 mmlb joined #git
12:01 Musok joined #git
12:01 boudiccas joined #git
12:03 jknetl joined #git
12:03 Sendoushi joined #git
12:03 stasmakarov joined #git
12:04 Sendoushi joined #git
12:04 kedare_ joined #git
12:06 Sceorem joined #git
12:06 Douhan joined #git
12:06 encod3 joined #git
12:07 a_thakur joined #git
12:07 encod3_ joined #git
12:07 boudicca joined #git
12:07 leeN joined #git
12:08 boudicca joined #git
12:08 pwnawannab[NE] joined #git
12:11 lamont joined #git
12:11 Sendoushi joined #git
12:12 ncd|leeN joined #git
12:13 philipp64|work joined #git
12:13 synthroid joined #git
12:15 Sendoushi joined #git
12:15 rwb joined #git
12:15 MattMaker joined #git
12:17 Kicer86 joined #git
12:18 espindola joined #git
12:19 jeffreylevesque joined #git
12:23 Cyw joined #git
12:24 eletuchy joined #git
12:24 acetakwas joined #git
12:25 AlexRussia joined #git
12:25 fracting joined #git
12:27 circ-user-MwZ8X I have noticed that I add a lot of formatting in unrelated code, which seems stable. I do not like formatting updates be mixed with my feature commits. I want to merge all small formatting shit that I find into a separate commit. How do I spit small formatting commits when working on the current feature?
12:27 DARSCODE joined #git
12:27 i7c You could use git add -p to add changes.
12:28 i7c And possibly first add all the functional ones and then all the formatting rest (or the other way round, whichever seems more convenient?).
12:28 jon-mac joined #git
12:28 circ-user-MwZ8X The problem is that you notice the formatting while you inspect the code for the functional needs.
12:30 i7c Where is the problem exactly?
12:30 i7c I mean yeah, that's often the case.
12:31 jceb joined #git
12:31 k3dare joined #git
12:31 nb-ben make it habitual to first format the code and then change its functionality
12:31 circ-user-MwZ8X You see that here you could code much more optimal and your hands are itching to reformat. Such It is sorta eyesoring. You cannot efficiently to accomplish the functional change.
12:31 nb-ben so you have two commits
12:32 djb-irc joined #git
12:32 elastix joined #git
12:32 nb-ben then if you failed with your functional changes you can reset back to your pretty formatted code commit
12:32 circ-user-MwZ8X But, once you have done with your new functionality, you have forgotten were all the nusances that pissed you off during the course.
12:33 jaaronamo joined #git
12:34 fuchstronaut joined #git
12:35 happy-dude joined #git
12:36 watabou joined #git
12:37 Lulzon left #git
12:37 iLembus_ joined #git
12:37 JeroenT joined #git
12:39 pmort joined #git
12:40 dermoth_ joined #git
12:40 interne7y joined #git
12:40 rossome joined #git
12:43 mizu_no_oto joined #git
12:45 livingstn joined #git
12:46 lindenle joined #git
12:47 achadwick joined #git
12:49 ochorocho__ joined #git
12:50 david007 joined #git
12:53 fission6 joined #git
12:53 jon-mac joined #git
12:53 dopesong joined #git
12:56 jessu joined #git
12:57 jessu hi what is git ?
12:57 selckin http://lmgtfy.com/?q=git
12:58 JeroenT joined #git
13:00 fahadash joined #git
13:00 LJHSLDJHSDLJH I created an alias.xname but it's not working when I use .. git xname
13:00 LJHSLDJHSDLJH alias.mylog=git log -p --abbrev-commit --stat --date short
13:00 nilsi joined #git
13:00 rgrinberg joined #git
13:01 CEnnis91 joined #git
13:01 selckin looks like its named mylog
13:01 LJHSLDJHSDLJH although it shows in the config and command syntax works separately
13:01 ybden LJHSLDJHSDLJH: just do `log -p --abbrev-commit --stat --date short` or ¬git log -p --abbrev-commit --stat --date short`
13:01 ybden LJHSLDJHSDLJH: it automatically prefixes it with git, unless you do !
13:01 ybden er, s/¬/`/
13:01 ybden oops
13:01 ybden latter should be !git log -p --abbrev-commit --stat --date short
13:02 ybden that is, `alias.mylog=log -p --abbrev-commit --stat --date short` or `alias.mylog=!git log -p --abbrev-commit --stat --date short`
13:04 JeroenT joined #git
13:06 jimi_ joined #git
13:06 lamppid joined #git
13:09 italoacasas joined #git
13:09 fuchstronaut joined #git
13:09 cdown joined #git
13:11 tgunr joined #git
13:12 soc42 joined #git
13:12 Gsham joined #git
13:15 unbalancedparen joined #git
13:16 DrSlony left #git
13:17 k3rn31 joined #git
13:18 notebox joined #git
13:18 Raging_Hog joined #git
13:20 rnsanchez_ joined #git
13:21 mflow joined #git
13:21 odingodner joined #git
13:22 mflow How can I make git show only return the author date of a commit without the file or diff?
13:22 mflow git show $hash --pretty='%an' returns the diff
13:22 mflow along the date
13:22 mflow I want only the date
13:23 boombatower joined #git
13:23 i7c git log $hash --pretty='%ad'
13:24 i7c err and -1 probably
13:24 mdw joined #git
13:24 lb mflow man git show search for: PRETTY FORMATS
13:24 gitinfo the git-show manpage is available at http://jk.gs/git-show.html
13:25 osse mflow: git show -s or git log -1
13:25 mdw joined #git
13:25 mohabaks joined #git
13:26 lb so the full version would be: git show -s <sha> --pretty='%aD'
13:26 boingy joined #git
13:26 cdg joined #git
13:27 thiago_ joined #git
13:27 diegoviola joined #git
13:27 xorox90 joined #git
13:28 ybden lb: they don't want the diff
13:28 ybden git log is just fine
13:29 lb compare the output ;)
13:30 vishnurao joined #git
13:30 btyne79 joined #git
13:30 i7c log with -1 seems a bit crippled in comparison to show -s. :)
13:30 ybden i7c: howso?
13:31 i7c Just by intuition, show is supposed to show one object and log is really more to inspect the history.
13:31 i7c Ofc the outcome is the same so doesn't really matter.
13:31 ybden I suppose that show is more semantically correct
13:31 i7c That's what I was trying to express.
13:32 mdw joined #git
13:35 xorox90 joined #git
13:36 __name__ joined #git
13:36 osse i7c: but you can do git log -2
13:36 osse and -3
13:37 osse and -69, -666 and -1337
13:37 watabou joined #git
13:38 i7c I'm aware.
13:38 i7c How about -42?
13:39 boudiccas joined #git
13:39 osse i assume so
13:39 osse I would be disappointed if not
13:39 i7c Likewise.
13:39 Khisanth joined #git
13:40 FeersumEndjinn joined #git
13:42 FeersumEndjinn Hi - we recently developed a new feature on a new branch which introduced some new CSS.  Tested fine on all supported browsers, so did a pull request and merged into master.  Users of old unsupported versions of IE complain, boss says rollback to before merge.  My question is, what is the best way to do that, and then push this back to the front of master?
13:42 reactormonk joined #git
13:42 i7c !revert
13:42 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
13:42 reactormonk How can I find out which gitignore file ignores a specific file? Or at least which gitignore files git is picking up? Can't figure out why a specific file isn't picked up.
13:43 italoacasas joined #git
13:43 FeersumEndjinn reactormonk: git should pick up .gitignore from repository root as far as I'm aware?
13:44 lb FeersumEndjinn you can have multiple .gitignore in sub dirs
13:44 reactormonk FeersumEndjinn, I just deleted all the contents, still ignored.
13:44 i7c FeersumEndjinn, this could be worth a read, too. https://git-scm.com/blog/201​0/03/02/undoing-merges.html
13:44 reactormonk lb, there's just one according to ls **/.gitignore
13:45 lb reactormonk do you know git check-ignore? ( although it just checks for ignorance, not for the ignore source)
13:45 FeersumEndjinn i7c: thanks, will take a look at that.  I'm just worried that whilst I can rollback the code to a specific point, that I'll encounter fast forward conflicts when I try and commit to push this back to the front of master
13:45 lb reactormonk there could also be system/user wide gitignores be present on your machine
13:46 reactormonk lb, checked user wide
13:47 lb reactormonk does `git config -l | grep core.excludesfile` show something?
13:47 ash_workz joined #git
13:47 lb reactormonk ahh got it
13:48 lb reactormonk git check-ignore -v <filename>
13:48 reactormonk just gives me a return value of 1, nothing else.
13:48 baraba joined #git
13:48 lb Oo
13:49 i7c FeersumEndjinn, yes, that's a valid concern. It will cause additional work (or "trouble") for your coworkers if you use the first approach (reset and remerge, which basically rewrites history).
13:49 Orion3k joined #git
13:49 nnyk_ joined #git
13:49 i7c FeersumEndjinn, the git-revert approach should be safe tho, history-wise.
13:49 FeersumEndjinn i7c:  Luckily for me, I'm the only dev on this project at the moment so if I can implement this, next time someone else works on this hopefully this is all undone :)
13:50 Noldorin joined #git
13:50 i7c Well if you work alone rewriting history shouldn't be too bad. :)
13:50 lb reactormonk https://git-scm.com/docs/git-check-ignore -> exit status 1 = None of the provided paths are ignored.
13:50 FeersumEndjinn I'm 45 commits ahead of where I need to be at the moment, so based on that info, how would be best?
13:50 reactormonk lb, yargh
13:51 FeersumEndjinn Ideally totally rewriting history is fine for me if it leaves a cleaner master branch
13:51 i7c interactive rebase and throw out what you don't want, maybe?
13:51 i7c Or do you just want to go back in history really?
13:51 FeersumEndjinn I actually don't want any of it so don't need any interactivity, just simply go back in history
13:52 i7c git reset --hard <commit-where-you-wanna-be>
13:52 FeersumEndjinn I still have the new feature in a separate branch so I won't lose anything
13:52 FeersumEndjinn i7c: and doing that won't give me any issues when I then commit that and push to github?
13:52 i7c git push --force-with-lease <remote> <branch>
13:53 FeersumEndjinn --force-with-lease is a new one on me
13:53 AaronMT joined #git
13:53 i7c FeersumEndjinn, if all you said is true and rewriting history is fine, you won't run into trouble.
13:53 neps joined #git
13:53 lmat joined #git
13:53 FeersumEndjinn i7c:  Many thanks :)
13:53 i7c --force-with-lease is the same as --force, just that it checks your remote/branch first if it matches with the actual revision at the remote.
13:54 lmat I have an alias, lola, defined as   lola = log --graph --oneline --decorate --all. I also have [pager] log = less -S (don't chop lines)
13:54 i7c If there is a mismatch git will complain.
13:54 lmat It's chopping lines.
13:54 boudiccas joined #git
13:54 MattMaker joined #git
13:54 lmat I should say,  git log isn't chopping lines, but lola is.
13:54 i7c This keeps you from rewriting things if someone else already did so.
13:54 lmat oh, nevermind...it's not chopping now.
13:55 lmat Ohhhhhhhhh it's chopping when I    git lola | head
13:55 madewokherd joined #git
13:55 lmat I guess I should head over to ##bash
13:55 MattMake_ joined #git
13:55 boudicca joined #git
13:57 fscala joined #git
13:57 ramsub07 joined #git
13:58 ramsub07 hello, i branched out of master a few days ago. I need to know at what commit i branched out. As in, what was the commit on master when i branched out?
13:59 osse ramsub07: git merge-base master yourbranch
13:59 xorox90 joined #git
14:01 Macaveli joined #git
14:02 jerematic joined #git
14:04 aavrug__ joined #git
14:04 neps joined #git
14:04 kadoban joined #git
14:05 JJM joined #git
14:06 djb-irc joined #git
14:08 FeersumEndjinn i7c: You sir, are a gentleman.  Fixed my problem perfectly, thank you again.
14:09 boudiccas joined #git
14:09 toogley joined #git
14:09 MattMaker joined #git
14:11 lb ramsub07 have a look at !lol
14:11 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
14:12 edude03 joined #git
14:12 boudicca joined #git
14:12 eletuchy joined #git
14:12 Fr4n joined #git
14:14 infra-red joined #git
14:15 mostlybadfly joined #git
14:17 sangy joined #git
14:17 boudiccas joined #git
14:17 MattMaker joined #git
14:18 linuxmint joined #git
14:19 bluezone joined #git
14:19 i7c FeersumEndjinn, you're welcome. :)
14:20 Ahmed90 joined #git
14:22 boudicca joined #git
14:22 jost__ joined #git
14:23 Fr4n joined #git
14:24 frem_ joined #git
14:27 CJKinni joined #git
14:27 Jellyg00se joined #git
14:30 espindol_ joined #git
14:31 eijk_ joined #git
14:31 yuhlw joined #git
14:35 boudicca joined #git
14:36 texasmynsted joined #git
14:36 eijk joined #git
14:38 RedShift joined #git
14:38 fmcgeough joined #git
14:38 watabou joined #git
14:40 dimi1947 joined #git
14:40 WayToDoor joined #git
14:41 interne7y joined #git
14:41 ramsub07 joined #git
14:41 MattMaker joined #git
14:42 Orion3k joined #git
14:44 rgrinberg joined #git
14:45 MattMake_ joined #git
14:45 rchavik joined #git
14:48 baraba joined #git
14:53 quenode_ joined #git
14:53 LJHSLDJHSDLJH joined #git
14:53 LJHSLDJHSDLJH joined #git
14:54 espindola joined #git
14:54 flaguy48 joined #git
14:57 kilo_bravo joined #git
14:58 rafalcpp joined #git
14:58 livingstn joined #git
14:59 drodger joined #git
14:59 livingstn joined #git
15:00 yuhlw joined #git
15:00 JJM joined #git
15:02 rgrinberg joined #git
15:03 Gsham joined #git
15:04 bango2 joined #git
15:04 rgrinberg joined #git
15:05 tyreld joined #git
15:05 dopesong joined #git
15:05 xorox90 joined #git
15:08 kpease joined #git
15:08 crst joined #git
15:08 drodger joined #git
15:09 Tecan joined #git
15:09 Tecan was wondering how i would check this repo out https://www.gitorious.org/guile-gcc/guile-​gcc/commit/ca3a6664e57f757aa37996d88708a32​1b84d67f8?p=guile-gcc:guile-gcc.git;a=tree​;h=refs/heads/master;hb=refs/heads/master
15:10 UTAN_dev joined #git
15:11 exarch joined #git
15:12 grawity start with `git clone https://www.gitorious.org/guile-gcc/guile-gcc.git`, which the new Gitorious somehow forgot to mention in their repo 'summary' tab
15:12 grawity if you specifically need commit ca3a6664e57, `git checkout` it
15:12 grawity though it's the latest commit anyways
15:13 Tecan thanks that worked
15:13 dmto joined #git
15:13 Tecan surprised gitorious doesnt provide that
15:13 grawity they probably forgot to configure it in gitweb
15:14 grawity it's just a mirror provided by some randos, anyway
15:14 crst left #git
15:17 encod3 joined #git
15:17 Fr4n joined #git
15:17 jonesinator joined #git
15:17 encod3 joined #git
15:18 MattMaker joined #git
15:18 griffindy joined #git
15:18 garethdaine joined #git
15:21 grawity joined #git
15:21 Gamecubic joined #git
15:22 dreiss joined #git
15:23 robotroll joined #git
15:24 llo joined #git
15:24 zivester joined #git
15:24 MattMaker joined #git
15:26 bilb_ono joined #git
15:27 eroussel joined #git
15:27 SoRoot joined #git
15:28 Schwarzbaer joined #git
15:32 rgrinberg joined #git
15:33 romerocesar joined #git
15:34 MattMake_ joined #git
15:34 ams__ joined #git
15:34 romerocesar joined #git
15:37 JohnBat26 joined #git
15:37 davisonio joined #git
15:39 TomyLobo joined #git
15:39 dietr1ch joined #git
15:39 watabou joined #git
15:39 MattMaker joined #git
15:41 raijin joined #git
15:41 a_thakur joined #git
15:42 neps joined #git
15:43 hobodave joined #git
15:44 MattMake_ joined #git
15:45 boudiccas joined #git
15:46 jjasinski joined #git
15:46 netcarver joined #git
15:47 madewokherd joined #git
15:47 LucaTM joined #git
15:47 t0by joined #git
15:49 lindenle joined #git
15:49 synthroid joined #git
15:49 diegoaguilar joined #git
15:49 bollullera left #git
15:50 diegoaguilar joined #git
15:51 MattMaker joined #git
15:51 LionsMane joined #git
15:51 boudicca joined #git
15:51 durham joined #git
15:51 durham joined #git
15:54 b1tchcakes joined #git
15:54 diegoaguilar joined #git
15:54 PCatinean joined #git
15:55 diegoaguilar joined #git
15:55 davisonio joined #git
15:56 MacWinner joined #git
15:57 rahtgaz joined #git
15:58 phaleth joined #git
15:58 t0by joined #git
15:58 davisonio joined #git
15:59 nnyk_ joined #git
16:00 lindenle joined #git
16:00 eletuchy joined #git
16:01 AaronMT_ joined #git
16:02 xorox90 joined #git
16:02 eijk_ joined #git
16:03 philipp64|work joined #git
16:04 aard_ joined #git
16:06 nnyk joined #git
16:07 davisonio joined #git
16:07 netj joined #git
16:07 neps joined #git
16:07 boudicca joined #git
16:07 stonerfish joined #git
16:08 gfortune joined #git
16:08 synthmeat joined #git
16:13 gfortune I have some code in a git clone on my local box (cloned from our gitlab server) that I would like to run from one of our database servers.   Is there a good way to get a clone onto the db server that does not require my credentials in gitlab to be used through the db server?
16:13 pullphinger joined #git
16:14 KevinMGranger packaging / archiving / pushing to the db server
16:15 kadoban gfortune: rsync, or whatever file transfer thing you like
16:15 gfortune The pushing in that case would be a simple file copy, correct?
16:15 texasmynsted joined #git
16:15 MattMake_ joined #git
16:16 gfortune kadoban: so don't use git at all for moving the files around?
16:16 izjaq joined #git
16:17 tomog999_ joined #git
16:17 snfgf joined #git
16:18 kadoban gfortune: I don't see any reason to. I don't use git for deployment, it's not designed for it, and it's not very good at it.
16:19 ilmari !deploy
16:19 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
16:22 bilb_ono joined #git
16:23 Wue joined #git
16:25 guardian hello, is there a way to disable colors when git log is used with a pretty format that contains color switches?
16:25 acetakwas joined #git
16:26 drodger joined #git
16:27 kadoban git --color=never or something maybe? It's probably not never, I forget what the actual value is though.
16:28 guardian nope
16:28 guardian pretty format starts with %C(auto) though
16:28 guardian as far as I understand man, it should disable colors when using --no-color
16:29 notebox joined #git
16:30 Bduo joined #git
16:31 ilmari always, auto or never, but that doesn't disable explicit %C in the format
16:31 dopesong joined #git
16:31 guardian hmm seems like you have to write it this way
16:31 guardian --pretty=format:'%C(auto,red)%h%Creset -%C(auto,yellow)%d%Creset %s %C(auto,green)(%cr)%C(auto,bold blue)<%an>%Creset'
16:32 dietr1ch joined #git
16:33 ilmari ah, that works
16:33 * ilmari fixes his alias
16:34 dreiss joined #git
16:35 juslintek joined #git
16:36 juslintek Hi I'm trying to write git pre-commit script
16:36 juslintek I want to make universal per directory
16:36 juslintek lets say I want it to be executed in each project i create in server
16:36 juslintek The script must get connection data from wp-config.php
16:36 juslintek dump database
16:36 juslintek and add it to git
16:37 milki this already sounds like a bad idea
16:37 juslintek its bitbucket private repo.
16:37 kaldoran joined #git
16:37 juslintek all of them will be like that.
16:38 sacha joined #git
16:38 juslintek And as well why does it sound like a bad idea?
16:38 milki database dumps in a git repo doesnt seem like a good use of git
16:38 netj joined #git
16:38 baraba joined #git
16:38 KevinMGranger Are you sure you want it pre-commit? You can put it in your skeleton dir
16:38 juslintek milki, so how should I backup db?
16:39 juslintek And save it with project, so on pull it would automatically add it to db
16:39 milki using normal database backup tools
16:40 juslintek milki, but it is a hassle, I want one commant or click to do it all in one place. Less hassle in long term.
16:40 KevinMGranger db *schema* or db *data* ?
16:40 juslintek As well it would be easier for other devs to setup project and already have demo data.
16:40 milki you think its less hassle. i dbout it though
16:41 juslintek KevinMGranger, both. I need both.
16:41 preaction you want devs to download every database dump that's ever been made just to work on the site?
16:41 nejni-marji joined #git
16:41 nejni-marji Does git understand hardlinks?
16:41 bremner not really
16:41 preaction nejni-marji: no. because hardlinks are invisible
16:41 juslintek Db dumbs will be overritten per each push from server.
16:41 nejni-marji That's a good pooint
16:41 preaction juslintek: that's not how git works
16:42 interne7y joined #git
16:42 juslintek but why you can version database
16:42 juslintek db is text file as well
16:42 juslintek You can see changes that have been made
16:42 preaction juslintek: the git repo has every version of every file that's ever been committed to the repo. when you download the repo, you get everything locally
16:42 preaction juslintek: git doesn't store deltas, it stores the whole file, entirely
16:43 KevinMGranger Until it's packed, that is
16:43 juslintek So maybe i should pack it.
16:43 juslintek Arghh
16:43 garethdaine joined #git
16:43 KevinMGranger To answer your original question, see the TEMPLATE DIRECTORY section of the git init man page
16:43 KevinMGranger !man git init
16:43 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
16:43 gitinfo the git-init manpage is available at http://jk.gs/git-init.html
16:44 Ravana joined #git
16:44 KevinMGranger I'm not entirely against your approach, just keep in mind that data is usually tracked separately from code. And I really don't think you want pre-commit
16:45 juslintek So which hook should I use?
16:46 KevinMGranger Well, I guess I don't understand the workflow entirely. Maybe you do want pre-commit
16:46 juslintek Well pre-commit script adds db dump
16:46 boudiccas joined #git
16:46 juslintek I just want to make it dynamic
16:47 juslintek So i can copy paste it per each git repo on the project and it would work
16:47 preaction oh it's going to be every commit even? how are people going to use the git history to see what happened if they have to scroll past a massive database dump?
16:47 MattMaker joined #git
16:47 LJHSLDJHSDLJH left #git
16:47 juslintek peaction, oh yeah, haven't thought about it.
16:47 preaction but i should just shut up because nobody's going to dissuade you from this absolutely terrible idea...
16:47 juslintek preaction.
16:48 juslintek So what kind of approach would be best?
16:48 diegoviola joined #git
16:48 juslintek Are archives versioned?
16:48 juslintek like zip or rar or tar.gz?
16:48 preaction i don't know what you mean by that
16:48 juslintek Or just overwritten
16:48 wviana left #git
16:48 preaction the git repo stores every version of every file that's ever been committed
16:48 MattMake_ joined #git
16:48 juslintek I does git show diff between zips and rars?
16:49 preaction that includes zip files, tarballs, images, sql files
16:49 eroussel joined #git
16:49 preaction no, binary files it will usually not display diffs, but displaying diffs says nothing about how the git repo stores data
16:49 juslintek or like zip 2016-05-07 and 2016-05-08
16:49 preaction you can make git display binary diffs using the gitattributes file, but that's off the topic here
16:49 juslintek I pushed one zip yesterday and today I pushed another
16:49 preaction the git repo has both in there
16:49 nejni-marji But git understands symlinks, right?
16:49 nejni-marji Those are visible
16:50 preaction nejni-marji: yes. if your filesystem does, they might even work
16:50 MattMak__ joined #git
16:50 nejni-marji Good.
16:50 nejni-marji Because for some stupid reason
16:50 nnyk joined #git
16:50 nejni-marji wiki redirects Xdefaults to Xresources, says Xdefaults is depreciated, but if I delete it my terminal stops working right
16:50 nejni-marji Isn't technology wonderful?
16:51 juslintek preaction, what is best practice in my case then. To version code and as well to store latest database in the same package?
16:51 sacha Hello I have a .git directory. How can I extract master branch from it??
16:51 Eugene sacha - man git-archive
16:51 gitinfo sacha: the git-archive manpage is available at http://jk.gs/git-archive.html
16:51 preaction juslintek: no. keep the data on the server. pull backups and put them on another server as needed. keep the schema in the repo
16:51 Mobutils joined #git
16:52 sacha Thanks
16:52 Eugene juslintek - !database_schema is a good read
16:52 gitinfo juslintek: Changing database schemas is a very complicated topic. Some reading: http://thedailywtf.com/Articles/​Database-Changes-Done-Right.aspx
16:52 preaction juslintek: git-annex and git-lfs are also things, but i really don't think that's what you want here
16:54 eletuchy joined #git
16:56 juslintek dang need to ask wordpress community, what is best practice to version database, maybe I can extract all data to php import files and then they can be used to put data back via php.
16:57 ShekharReddy joined #git
16:58 ToBeCloud joined #git
16:58 JZA joined #git
16:59 IWishIKnew joined #git
16:59 JZA hi I have an issue with a push I am trying to do. There is a change that my pull didnt get.
17:00 rominronin joined #git
17:00 Raging_Hog joined #git
17:00 durham joined #git
17:01 govg joined #git
17:01 shinnya joined #git
17:01 jaguarmagenta joined #git
17:01 JZA I think I need to stash the changes
17:03 nitin joined #git
17:03 reim joined #git
17:04 Ediz joined #git
17:05 ramsub07 joined #git
17:05 deadnull_ joined #git
17:07 bilb_ono joined #git
17:08 gfortune kadoban, ilmari: Thanks for the info.  That's very helpful.
17:08 italoacasas joined #git
17:09 davisonio joined #git
17:10 eijk joined #git
17:11 son joined #git
17:11 Szym joined #git
17:12 romerocesar joined #git
17:12 SimonK joined #git
17:13 netj joined #git
17:13 kaldoran joined #git
17:14 ramsub07 joined #git
17:14 kaldoran joined #git
17:15 kaldoran joined #git
17:15 mikecmpbll joined #git
17:16 jimi_ joined #git
17:16 Limes_ joined #git
17:17 djb-irc joined #git
17:17 jimi_ joined #git
17:17 SteffanW joined #git
17:19 _xor Probably a dumb question, but can a remote tracking branch be added to a complete different, unrelated repo?
17:19 hahuang61 joined #git
17:19 grawity remote tracking branches are added for whatever remotes you add via `git remote`
17:20 grawity there are no specific requirements for common history or anything
17:21 _xor So if I have repos A and B that are completely separate and unrelated, I can add a remote tracking branch in B that points to some branch in A.  Do I have that right?
17:21 wviana joined #git
17:21 thiago joined #git
17:21 grawity yes
17:21 _xor Cool :)
17:21 grawity except for the part where you 'add' remote tracking branches
17:21 XHFHX joined #git
17:22 _xor Hmm. I'm trying to settle on how I want to structure my projects.  I'm using GitLab as my "main" server.  My current options seem to be...
17:22 _xor A) Keep everything in one single repo.  B) Keep a master repo with submodules for different components (Android app, iOS app, etc.).  C) Keep a single repo with worktrees.  D) Keep separate repos all together.
17:23 grawity E) Just keep separate repos.
17:23 _xor The main thing is that I want to track & be able to keep in sync a given project folder across 2-3 different workstations.
17:23 Paras joined #git
17:23 _xor Hmm, yeah I'm considering that.
17:23 Somelauw joined #git
17:23 _xor Any particular reason why it would be better?
17:23 roentgen joined #git
17:23 roentgen joined #git
17:23 leeN joined #git
17:24 XHFHX Hi there. I want to add something to a project at github but I can't push it because I can't make it public, just for myself. But I still want to be able to pull the updates from the public stream. The problem is that I have to add one line to this file ( https://github.com/rg3/youtube-dl/blob/m​aster/youtube_dl/extractor/extractors.py ) in order to get it work. Can I say that follow every change on this file except my line?
17:24 _xor Someone mentioned comparing histories would be harder if kept in separate repos, but that's not a huge concern right now for me.
17:24 irco joined #git
17:24 grawity XHFHX: no
17:24 Somelauw I have broken my git somehow. When typing 'git branch' it tells me: fatal: Failed to resolve HEAD as a valid ref.
17:24 Paras joined #git
17:25 XHFHX grawity: what's the best option then?
17:25 grawity Somelauw: what does `git symbolic-ref HEAD` show?
17:25 netj joined #git
17:25 Somelauw grawity: fatal: No such ref: HEAD
17:25 grawity point it to refs/heads/master
17:25 Somelauw I broke it by using vim-fugtive
17:26 Somelauw grawity: you mean, edit .git/HEAD?
17:26 Somelauw the contents of this file are: ref: refs/heads/master
17:26 fracting joined #git
17:27 vishnurao joined #git
17:27 neps joined #git
17:27 Somelauw removing the 'ref: ' in front of it may have helped
17:27 grawity or it may have not
17:28 Somelauw at least now git symbolic-ref HEAD returns /refs/heads/master
17:29 henriquev___ left #git
17:30 Paras left #git
17:30 ahmed_elgabri joined #git
17:31 Somelauw grawity: it's not fixed. My index shows "fatal: not a git repository".
17:31 netj joined #git
17:33 Somelauw i'll undo my changes to get back to the broken state
17:34 timblechmann joined #git
17:35 xorox90 joined #git
17:36 thiago joined #git
17:37 Darcidride joined #git
17:38 xorox90 joined #git
17:39 settermjd joined #git
17:40 Somelauw okay, i fixed it manually. it does need 'ref: ' in front, my .git/refs/heads/master was corrupted
17:41 rgrinberg joined #git
17:41 xorox90 joined #git
17:42 rgrinberg joined #git
17:43 knutstrut joined #git
17:43 thiago joined #git
17:43 CJKinni` joined #git
17:43 xorox90 joined #git
17:44 WayToDoor joined #git
17:46 watabou joined #git
17:46 d5sx43 joined #git
17:46 rgrinberg joined #git
17:48 romerocesar joined #git
17:48 edude03 joined #git
17:49 eletuchy joined #git
17:49 rgrinberg joined #git
17:49 Dyonisos joined #git
17:50 mangolisk_ joined #git
17:51 fracting joined #git
17:51 nilsi joined #git
17:52 Sasazuka__ joined #git
17:53 rgrinberg joined #git
17:54 A124 joined #git
17:54 eletuchy joined #git
17:56 rgrinberg joined #git
18:01 dreiss joined #git
18:01 rominronin joined #git
18:02 dopesong joined #git
18:02 garethdaine joined #git
18:06 mikecmpbll joined #git
18:07 hahuang65 joined #git
18:08 ramsub07 joined #git
18:09 hahuang61 joined #git
18:10 ochorocho__ joined #git
18:13 eeo joined #git
18:14 fuchstronaut joined #git
18:14 Repox joined #git
18:15 CBX joined #git
18:16 durham joined #git
18:18 durham joined #git
18:18 morenoh149 joined #git
18:18 tomboy64 joined #git
18:19 morenoh149 how do I revert a git commit but as a new commit?
18:19 xorox90 joined #git
18:19 morenoh149 so undo a commit but leave a trail
18:19 eroussel joined #git
18:19 arooni joined #git
18:20 kadoban morenoh149: With 'git revert'
18:20 morenoh149 thanks
18:21 thiago joined #git
18:24 Schwarzbaer joined #git
18:24 Spacew00t joined #git
18:31 dopesong joined #git
18:32 nowhere_man joined #git
18:34 nilg joined #git
18:34 espindola joined #git
18:35 espindola joined #git
18:36 deadnull_ joined #git
18:37 jstimm joined #git
18:37 noobiewan joined #git
18:39 noobiewan hey guys, I had some big files in my repo that I download on my last commit. Now I want to push the current state only to the remote repo. How can I do this? It's an empty remote. If I simple push it, it will push all the history and it will exceed the available space I have for that repo. Thank you
18:39 noobiewan *that I deleted (not downloaded)
18:39 Somelauw First I git stashed my changes, then I performed a cherry-pick and then I merged that cherry pick with my own changed and comitted. After doing git stash pop, it tells me there is an unmerged path. What is that?
18:40 kadoban noobiewan: Start an orphan branch with just the current state I guess
18:40 multi_io joined #git
18:41 Ahmed90 joined #git
18:42 nwkj86 joined #git
18:43 interne7y joined #git
18:44 dfyc joined #git
18:44 siprbaum joined #git
18:46 macefr joined #git
18:47 watabou joined #git
18:50 garethdaine joined #git
18:53 LaT0rtue joined #git
18:53 SoRoot joined #git
18:54 CJKinni`` joined #git
18:55 eletuchy joined #git
18:56 fuchstronaut joined #git
18:56 przemoc joined #git
18:58 diogenese joined #git
19:00 davisonio joined #git
19:00 rominronin joined #git
19:01 neps joined #git
19:02 neps joined #git
19:02 jaguarmagenta joined #git
19:05 grubles_ joined #git
19:06 wviana joined #git
19:07 eletuchy joined #git
19:07 diogenese joined #git
19:08 rueben_ joined #git
19:09 diogenese joined #git
19:09 Rish joined #git
19:10 eletuchy_ joined #git
19:11 WaReZ joined #git
19:11 wald joined #git
19:12 yqt joined #git
19:12 eletuch__ joined #git
19:13 cyan__ joined #git
19:14 boudiccas joined #git
19:16 eletuchy joined #git
19:19 diogenese joined #git
19:19 nejni-marji left #git
19:19 nitin joined #git
19:19 eletuchy_ joined #git
19:21 JZA hi how can I setup my login/pwd so it doesnt keep asking me everytime?
19:22 eletuchy joined #git
19:22 italoacasas joined #git
19:23 t0by joined #git
19:24 nitin_ joined #git
19:25 denimsoft joined #git
19:26 boudicca joined #git
19:26 Rish joined #git
19:26 eletuchy_ joined #git
19:27 Eugene JZA - !github_ssh
19:27 gitinfo JZA: [!ssh_github] If you are having problems accessing github repos over HTTPS you should switch to SSH (the default used by git, for many very good technical reasons): https://help.github.com/ar​ticles/generating-ssh-keys
19:27 alex1a joined #git
19:30 k3rn31 joined #git
19:30 reactormonk Is there a GUI to browse old versions of files?
19:31 circ-user-MwZ8X Curiously, I have removed an empty line after a line of text but git reports me that tile of text itself has changed, like -a line of text   +a line of text
19:31 circ-user-MwZ8X I mean like
19:31 circ-user-MwZ8X -a line of text
19:31 circ-user-MwZ8X here goes an empty line
19:31 circ-user-MwZ8X +a line of text
19:31 eletuchy joined #git
19:32 rgrinberg joined #git
19:32 johnmilton joined #git
19:32 starsinmypockets joined #git
19:32 circ-user-MwZ8X I remember that in the past git diff reported -(empty line) if empty line removed
19:32 shafox joined #git
19:33 starsinmypockets I want to delete a branch, but... is there a way to ensure that the branch to-delete does not contain any 'unique' commits (I know that's not how it works but I want to make sure there are no commits that are ONLY in the branch to be deleted)
19:33 rueben_ joined #git
19:33 mmlb joined #git
19:34 MrWoohoo joined #git
19:34 eletuchy_ joined #git
19:36 hashpuppy joined #git
19:36 SwiftMatt joined #git
19:37 dsdeiz joined #git
19:37 circ-user-MwZ8X I think that you need to check the hash codes.
19:37 mbrzuzy joined #git
19:37 boudiccas joined #git
19:37 dhollinger joined #git
19:38 eletuchy joined #git
19:39 italoacasas joined #git
19:39 kenansulayman joined #git
19:40 sangy joined #git
19:41 circ-user-MwZ8X It is a worthy question, worth to ask at SO. On the other hand, I have a lot of editions of the same commit. So, I think that the tool that would check that is useless. I want only latest edition of the commit to appear in the branch, despite all editions are "unique commits".
19:42 eletuchy_ joined #git
19:42 allcentu1 joined #git
19:43 rueben_ joined #git
19:44 italoacasas joined #git
19:44 rgrinberg joined #git
19:44 eletuchy joined #git
19:44 denimsoft joined #git
19:45 mizu_no_oto joined #git
19:46 eletuchy_ joined #git
19:48 watabou joined #git
19:48 rueben_ joined #git
19:49 urx joined #git
19:49 eletuchy joined #git
19:52 eletuchy_ joined #git
19:53 josuebrunel joined #git
19:54 ProbabilityMoon joined #git
19:55 qrcu joined #git
19:56 m0viefreak joined #git
19:57 mablae joined #git
19:58 fuchstronaut joined #git
19:59 livingstn joined #git
19:59 Psychiatrist joined #git
20:00 rueben_ joined #git
20:01 rominronin joined #git
20:02 satifant joined #git
20:02 fahadash joined #git
20:02 SwiftMatt joined #git
20:05 Rish joined #git
20:05 XHFHX2 joined #git
20:06 neps joined #git
20:06 ochorocho__1 joined #git
20:07 cdg joined #git
20:07 mdw joined #git
20:08 circ-user-MwZ8X It is weird. I have reset to one of the commits, checked if browser can load it and switched to even more earlier commit. But, the second reset has failed because of uncommitted changes (I did both of them hard). I have to idea where those source changes came from. I believed that hard reset must alwas succeed because it abandons any uncommitted changes.
20:08 circ-user-MwZ8X I could not do any reset until switched to another branch. This also failed, but first branch is able to reset now.
20:09 cdg joined #git
20:09 albel727 joined #git
20:12 albel727 joined #git
20:15 Rish joined #git
20:17 peepsalot i have a local repo and my own branch that i've been commiting to, if i view git log, and find the first commit that wasn't me, that should be the commit that my branch was based off of?
20:19 peepsalot i'm thoroughly confused because the date i'm seeing on that commit is way before the branch was made, and there were other commits that should have been in there in that time, as far as i can tell
20:21 osse peepsalot: you ayou
20:21 osse peepsalot: you are probably correct
20:21 osse do git log --decorate
20:22 osse that is useful, so use it always:  git config --global log.decorate true
20:22 osse it will mark commits as branches if relevant
20:23 dzho joined #git
20:24 unbalancedparen joined #git
20:25 Rish joined #git
20:26 johnmilton joined #git
20:28 duderonomy joined #git
20:28 allcentury joined #git
20:30 elastix joined #git
20:33 denimsoft joined #git
20:34 diegoviola joined #git
20:37 diogenese joined #git
20:39 ojdo joined #git
20:41 haq joined #git
20:43 johnmilton joined #git
20:43 interne7y joined #git
20:44 bjpenn joined #git
20:45 bjpenn whats the best way to break a code change away from an existing commit, onto a new separate commit
20:45 bjpenn and then merge that commit onto another branch
20:45 madewokherd joined #git
20:45 BSaboia joined #git
20:46 BSaboia joined #git
20:46 BSaboia joined #git
20:46 BSaboia joined #git
20:48 radsy joined #git
20:48 jhass I usually git reset before it and git commit -p two new commits, then rebase around
20:49 fracting joined #git
20:49 jhass if you just want some changes from the commit in some other branch but leave the original fully intact, just git show | git apply, git commit -p in the target branch
20:50 bjpenn jhass: hmm ok
20:50 bjpenn let me try that
20:50 bjpenn this seems like an advance git exercise for me :p
20:50 lamont joined #git
20:51 xbob joined #git
20:51 ahr3n joined #git
20:51 GT joined #git
20:51 Zish joined #git
20:52 bjpenn what does git show by itself do?
20:52 bjpenn i just tried it and it seems it shows all commits?
20:52 bjpenn hmm maybe not all
20:52 diogenese joined #git
20:52 sangy joined #git
20:53 bjpenn yah i guess just the last commit
20:53 jhass bjpenn: a specific one, if you give it no argument, the HEAD commit
20:53 Fr4n left #git
20:53 jhass bjpenn: so give it the commit sha of the commit you want
20:54 sdothum joined #git
20:56 Saxon joined #git
20:57 mmlb joined #git
20:58 m1dnight_ joined #git
20:58 texasmynsted left #git
21:00 Xjaey joined #git
21:02 axiom_1 joined #git
21:02 rominronin joined #git
21:02 fission6 joined #git
21:03 jaguarmagenta joined #git
21:03 bittin joined #git
21:05 UTAN_dev_ joined #git
21:05 ynanm joined #git
21:06 diegoaguilar joined #git
21:06 dopesong_ joined #git
21:09 fission6_ joined #git
21:09 neanderslob joined #git
21:10 UTAN_dev joined #git
21:10 neilthereildeil joined #git
21:10 BSAlb joined #git
21:10 neps joined #git
21:11 neilthereildeil hey guys
21:11 neilthereildeil git tells me some files are modified, but git diff on them doesnt show any changes
21:11 neilthereildeil whats happening?
21:12 jhass neilthereildeil: git diff HEAD
21:12 jhass I guess you already staged them
21:13 neilthereildeil yea they are staged
21:13 italoacasas joined #git
21:13 neilthereildeil so it was comparing the current file to the file in the current commit, which were identicle?
21:13 jhass not the current commit, against the staging area
21:14 neilthereildeil wait, what was getting compared?
21:14 BSAlb joined #git
21:14 jhass git diff HEAD compares against the current commit
21:14 jhass nothing since you don't have any unstaged changes
21:15 mellernoia joined #git
21:15 neilthereildeil why do these files show up in green staged although they dont have any changes?
21:15 jhass ran git diff HEAD yet?
21:15 neilthereildeil yea and i see all the changes
21:16 preaction they do have changes. the changes are from HEAD (the last commit) and the staging area. when you do "git add" or "git rm", you add the changes to the staging area.
21:16 jhass they "show up in green" (better worded in the staging area) because you staged them, likely by running git add on them
21:16 neilthereildeil ahh ok. so if i dont make any modifications to a file i can still stage by running git add on it?
21:16 jhass no
21:16 jhass I mean you can but it has no effect
21:17 jhass it's not actually the file that's transferred into the staging area, its its changes
21:17 jhass if there are no changes, nothing happens
21:17 CJKinni joined #git
21:18 lopin joined #git
21:19 bjpenn jhass: how about git apply? ive spent the last 20 mins or so reading about git apply
21:19 bjpenn still not sure what it does
21:19 bjpenn it has something to do with "patches"
21:19 jhass bjpenn: which git show gives you
21:19 jhass bjpenn: git show <sha> | git apply
21:19 bjpenn i dont want to apply the entire commit though
21:19 jhass bjpenn: hence git commit -p afterwards
21:19 bjpenn just part of it
21:20 bjpenn jhass: AHHH
21:20 jhass once you committed just git checkout the rest
21:20 Grimm_ joined #git
21:20 bjpenn sweet...
21:20 bjpenn i think im clear now
21:20 jhass cool
21:20 neilthereildeil whats the difference between "git checkout HEAD" and "git checkout MASTER"?
21:21 jhass without file arguments, git checkout HEAD is usually a noop
21:21 italoacasas joined #git
21:22 jhass git checkout MASTER would checkout the MASTER branch (note the default branch is called master, lowercase)
21:22 bjpenn jhass: gave me an error, saying theres a trailing white space, and theres a file that doesnt exist
21:23 bjpenn i typed in `git show <sha> | git apply'
21:23 eletuchy joined #git
21:24 jhass bjpenn: and no changes at all in the working tree? (git status)
21:24 jhass try git apply -3 then
21:25 jhass and watch out for conflict markers
21:25 bruce_lee joined #git
21:25 bjpenn jhass: no changes at all
21:25 bjpenn jhass: i think that whole process failed
21:25 jhass git apply --reject might be another option
21:25 bjpenn jhass: ok let me try that
21:26 bjpenn trying --reject
21:26 mdw joined #git
21:26 bjpenn k a bunch of stuff got applied cleanly
21:26 bjpenn some didnt
21:26 GavinMagnus joined #git
21:26 bjpenn because "no file found"
21:26 bjpenn now i see all the changes
21:26 mizu_no_oto joined #git
21:27 italoacasas joined #git
21:27 fission6 joined #git
21:27 mdw_ joined #git
21:28 eletuchy_ joined #git
21:28 Brando753-o_O_o joined #git
21:28 jimi_ joined #git
21:30 bluepixel joined #git
21:31 eletuchy joined #git
21:31 neilthereildeil i did git reset --hard HEAD^ a few times and i cannot see anything in git log after a few commits ago
21:31 neilthereildeil how can i view newer commits?
21:31 bjpenn jhass: this essentially creates a whole new commit right? so eventually when the branch that pulled the changes from gets merged into this one, there will be a merge conflict?
21:32 bjpenn jhass: this meaning "git show <sha> | git apply --reject"
21:32 GavinMagnus because you decrement your commit pointer, hence you cannot see forward
21:32 jhass bjpenn: yes
21:32 jhass bjpenn: no way around that
21:32 bjpenn jhass: k that works
21:32 bjpenn jhass: i was thinking maybe to break up the existing commit in the other branch to separate that change itno its own commit
21:33 bjpenn how would i go about doing that?
21:33 bjpenn and then maybe cherry pick it over, or something
21:33 bjpenn ivenever used cherry-pick but i remember it did that sort of thing
21:34 jhass bjpenn: now that we basically did a partial cherry-pick by hand here, you could rebase the other branch against this, will get a conflict on that commit and in resolving  that conflict remove the changes from it
21:34 rgrinberg joined #git
21:34 eletuchy_ joined #git
21:34 neilthereildeil so then how would i undo these changes and checkout the most recent commit in this branch?
21:34 jhass bjpenn: if rebasing against it is not an option, git rebase -i against the base commit, pick edit
21:35 SwiftMatt joined #git
21:36 jhass bjpenn: then one option would be to git reset one up and git commit -p twice
21:36 neilthereildeil jhass: any idea?
21:37 bjpenn jhass: thanks :)
21:37 bjpenn jhass: how did you learn so much from git, did you read a book or something
21:37 jhass neilthereildeil: hard to tell, the most general answer is to find the sha you want to go backto in git reflog and git reset --hard to it
21:37 eletuchy joined #git
21:38 jhass bjpenn: uh I read pro git years ago, someday the base concepts clicked in and then it falls into place and you can easily learn and compose stuff as you use it daily
21:38 Juzzika joined #git
21:39 jhass bjpenn: https://www.youtube.com/watch?v=1ffBJ4sVUb4 can help a bunch towards that basic understanding
21:39 jhass though I watched it after it already clicked for me, so can't say 100% certain
21:39 eletuch__ joined #git
21:40 mdw joined #git
21:42 hahuang65 joined #git
21:42 denimsoft joined #git
21:42 eletuchy joined #git
21:43 TinkerTyper joined #git
21:43 edude03 joined #git
21:44 eletuchy_ joined #git
21:45 bjpenn jhass: ill check that out
21:46 ahmed_elgabri joined #git
21:46 eletuch__ joined #git
21:47 Mateo_W joined #git
21:48 hahuang65 joined #git
21:49 rossome joined #git
21:49 CheckDavid joined #git
21:50 BSaboia joined #git
21:50 eletuchy joined #git
21:51 vishal joined #git
21:53 eletuchy_ joined #git
21:53 boudiccas joined #git
21:54 eletuch__ joined #git
21:54 sgen joined #git
21:58 mellernoia joined #git
21:58 eletuchy joined #git
21:58 hahuang65 joined #git
22:00 eletuchy_ joined #git
22:02 eletuch__ joined #git
22:02 fuchstronaut joined #git
22:03 rominronin joined #git
22:04 xbob_ joined #git
22:05 LeBlaaanc joined #git
22:05 LeBlaaanc how do i git ignore all folders like this `*.xcodeproj/project.xcworkspace/**/*`
22:05 eletuchy joined #git
22:06 LeBlaaanc the *.xcodeproj part isn't woriing
22:06 LeBlaaanc **/*.xcodeproj/xcuserdata/**/* maybe?
22:06 LeBlaaanc **/*.xcodeproj/project.xcworkspace/**/* rather*
22:07 eletuchy_ joined #git
22:08 wrouesnel1 joined #git
22:09 cdg joined #git
22:10 espindola joined #git
22:10 eletuchy joined #git
22:11 a_thakur joined #git
22:12 eletuch__ joined #git
22:13 belak joined #git
22:13 Hoy joined #git
22:13 GavinMagnus left #git
22:15 neps joined #git
22:16 eletuchy joined #git
22:16 sgen does anyone know how to reference an issue in another repo on github?
22:17 eletuchy_ joined #git
22:19 eletuch__ joined #git
22:21 jhass sgen: either just paste full URL, github will render it nicely
22:21 jhass or user/repo#number should work too, though I never tried
22:23 eletuchy joined #git
22:24 hahuang65 joined #git
22:25 italoacasas joined #git
22:25 Samual joined #git
22:26 eletuchy_ joined #git
22:27 mischat joined #git
22:27 sgen jhass: ty
22:28 Vinnie_win_f joined #git
22:29 jstimm joined #git
22:29 a3Dman joined #git
22:29 eletuchy joined #git
22:31 cdown joined #git
22:31 mykespb joined #git
22:32 drodger joined #git
22:37 EduardoMartins joined #git
22:43 boudicca joined #git
22:44 Arsonide joined #git
22:44 interne7y joined #git
22:45 rxc joined #git
22:45 rxc joined #git
22:47 pawel0982 joined #git
22:48 philipp64|work any other git developers around?
22:48 mmlb joined #git
22:48 philipp64|work I've broken one of the unit tests and can't figure out how to unbreak it.
22:48 milki lol
22:49 milki philipp64|work: no developers here afaik
22:49 milki philipp64|work: they all live on the mailing list
22:49 Mateo_W joined #git
22:49 Grievre philipp64|work: git bisect :)
22:51 eletuchy joined #git
22:57 eletuchy joined #git
22:57 espindola joined #git
22:57 interne7y joined #git
22:58 jimi_ joined #git
22:58 neilthereildeil left #git
22:59 sweatsuit joined #git
23:04 jaguarmagenta joined #git
23:04 rominronin joined #git
23:08 nickthetait joined #git
23:09 Mateo_W joined #git
23:09 Didac joined #git
23:12 Mateo_W joined #git
23:17 ahr3n_ joined #git
23:17 anth0ny joined #git
23:18 mablae_ joined #git
23:19 a3Dman joined #git
23:20 neps joined #git
23:20 trobotham joined #git
23:21 ffabi joined #git
23:22 bluepixel joined #git
23:25 espindola joined #git
23:27 eaa joined #git
23:28 Douhan joined #git
23:35 mattfoo joined #git
23:37 thiago joined #git
23:40 jimi_ joined #git
23:42 ToBeCloud joined #git
23:43 rkazak joined #git
23:43 fahadash joined #git
23:45 espindola joined #git
23:46 cdg joined #git
23:48 diegoviola joined #git
23:49 rbern joined #git
23:53 fstd_ joined #git
23:53 fstd_ joined #git
23:54 eletuchy joined #git
23:55 mmlb joined #git
23:56 rueben joined #git
23:56 bjpenn joined #git
23:59 Yhie joined #git

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