Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-10

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

All times shown according to UTC.

Time Nick Message
00:01 eletuch__ joined #git
00:04 elisa87 why do I get this http://pastebin.com/C7r1SSaW
00:04 eletuchy joined #git
00:06 warthog9 joined #git
00:06 eletuchy_ joined #git
00:07 Grimm_ probably have to update the .git/config file with your new username
00:08 Grimm_ so "projectFolder/.git/config"
00:08 elisa87 cat: projectFolder/.git/config: No such file or directory
00:09 rominronin joined #git
00:09 Grimm_ projectFolder is the name of the folder your project is in
00:09 Grimm_ if your talking about monajalal.github.io then it's in the monajalal.github.io/.git/config
00:10 eletuchy joined #git
00:10 elisa87 no I am talking about another project
00:11 elisa87 what should be changed here http://pastebin.com/rYNNUuU5 ?
00:11 eletuch__ joined #git
00:13 Grimm_ in my config the URL = is https:// maybe try changing it to URL = https://github.com/monajalal/web_dev.git
00:14 Grimm_ i'm not really sure though..
00:14 Grimm_ i'd back it up before changing anything
00:15 barteks2x joined #git
00:15 xelxebar joined #git
00:15 eletuchy joined #git
00:16 joaumg joined #git
00:16 eletuchy_ joined #git
00:18 SwiftMatt joined #git
00:18 nowhere_man joined #git
00:19 theresajayne joined #git
00:19 jaguarmagenta joined #git
00:19 ToeSnacks joined #git
00:19 DuncanT joined #git
00:20 eletuchy joined #git
00:20 parliament joined #git
00:20 mehdi_ joined #git
00:20 ahmedelgabri joined #git
00:20 WillMoogle joined #git
00:20 vcoinminer joined #git
00:20 contracode joined #git
00:20 FritzLakritz joined #git
00:20 DarkMukke joined #git
00:20 wizonesolutions joined #git
00:20 metastableB joined #git
00:20 janx joined #git
00:20 Tee_Pee joined #git
00:20 JohnLea___ joined #git
00:20 etcinit joined #git
00:20 frem_ joined #git
00:21 dunk joined #git
00:21 yena joined #git
00:21 elijah joined #git
00:21 scalability-junk joined #git
00:21 CheckDavid joined #git
00:21 boxrick1 joined #git
00:21 shennyg joined #git
00:21 eletuch__ joined #git
00:22 harleypig joined #git
00:22 zero7 joined #git
00:22 ionelmc joined #git
00:22 Rodya_ joined #git
00:22 droidicus joined #git
00:22 zeller joined #git
00:24 Mateo_W joined #git
00:26 Meow-J joined #git
00:26 bttf joined #git
00:26 kulelu88 joined #git
00:26 kulelu88 joined #git
00:27 jimi_ joined #git
00:28 allcentury joined #git
00:29 dingus joined #git
00:29 zmanfx joined #git
00:30 fabio_ joined #git
00:31 ki0 joined #git
00:33 dokma vishal: thank you!
00:36 siprbaum joined #git
00:37 ELFrederich joined #git
00:40 XDS2010 joined #git
00:41 LaT0rtue joined #git
00:47 rb_ joined #git
00:47 griffindy joined #git
00:50 Saturn812 joined #git
00:50 Schwarzbaer__ joined #git
00:50 arescorpio joined #git
00:50 drodger joined #git
00:55 qpdb joined #git
00:55 benwbooth joined #git
00:55 interne7y joined #git
00:56 svankmajer joined #git
00:59 edude03 joined #git
01:00 eletuchy joined #git
01:02 Kaisyu joined #git
01:03 Wulf4 joined #git
01:04 Douhan joined #git
01:05 dermoth joined #git
01:10 rominronin joined #git
01:13 eroussel joined #git
01:16 ELFrederich joined #git
01:16 ahmedelgabri joined #git
01:17 wxg joined #git
01:18 watabou joined #git
01:20 fstd_ joined #git
01:21 pks joined #git
01:21 tabakhase NotLikeThis
01:21 fscala joined #git
01:21 tabakhase my rebase is acting wirdo while trying to replay https://git-scm.com/blog/2010/03/17/replace.html
01:22 lukeshu` left #git
01:23 NeverDie joined #git
01:24 tabakhase i get the new initial commit, but rebasing the rest of my tree onto it seems undoable
01:24 Guest9 joined #git
01:26 xorox90 joined #git
01:27 BenderRodriguez joined #git
01:28 harish joined #git
01:29 Dougie187 left #git
01:29 allcentury joined #git
01:31 CEnnis91 joined #git
01:35 Orion3k joined #git
01:35 IWishIKnew joined #git
01:35 ELFrederich joined #git
01:35 dermoth joined #git
01:36 ensyde__ joined #git
01:42 asimzaidi joined #git
01:46 drodger joined #git
01:46 liuzhen joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and comedy salvation | 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 | git pull a day keeps the conflict's away
01:49 AfroThundr joined #git
01:50 syionide joined #git
01:51 Rodya_ joined #git
01:53 fahadash joined #git
01:53 ki0 joined #git
01:57 ahr3n joined #git
02:02 clemf joined #git
02:03 drbean joined #git
02:04 jeffreylevesque_ joined #git
02:06 eletuchy joined #git
02:07 madewokherd joined #git
02:07 mizu_no_oto joined #git
02:09 livingstn joined #git
02:11 rominronin joined #git
02:11 kballou left #git
02:13 kus joined #git
02:15 eletuchy joined #git
02:15 watabou joined #git
02:17 ahmedelgabri joined #git
02:18 wviana_ joined #git
02:19 son joined #git
02:20 jaguarmagenta joined #git
02:24 svankmajer joined #git
02:24 rahtgaz joined #git
02:27 warthog9 joined #git
02:28 Mobutils_ joined #git
02:30 allcentury joined #git
02:30 espindola joined #git
02:31 boudicca joined #git
02:34 texinwien joined #git
02:36 eletuchy joined #git
02:42 chachasmooth joined #git
02:44 fstd_ joined #git
02:47 elisa87 hey hours passed but still can't see anything here http://monajalal.github.io/ even though I have this github repo https://github.com/monajalal/monajalal.github.io any help is really appreciated
02:52 ojacobson elisa87: you may want to consider talking to github's lovely support folks.
02:52 Rodya_ joined #git
02:54 ki0 joined #git
02:56 interne7y joined #git
02:58 hexagoxel joined #git
02:58 mostlybadfly joined #git
02:59 aavrug joined #git
02:59 semanticpc joined #git
03:01 ajf- joined #git
03:06 aidalgol I have been working on a branch for a short time, and am ready to push it to my teammates.  I want to squash all commits on the branch into one commit, and commit that one commit onto the master branch.  Is 'merge --squash' what I want?
03:12 Gsham joined #git
03:12 rominronin joined #git
03:15 IWishIKnew joined #git
03:15 mehola joined #git
03:18 ahmedelgabri joined #git
03:18 eletuchy joined #git
03:18 Gsham joined #git
03:21 k3rn31 joined #git
03:27 ochorocho__ joined #git
03:28 svankmajer joined #git
03:28 svankmajer joined #git
03:29 JanC joined #git
03:30 Goplat joined #git
03:31 allcentury joined #git
03:35 xorox90 joined #git
03:46 nsanden joined #git
03:48 nsanden i got this weird problem all of a sudden https://i.imgur.com/0P8IL7H.png
03:49 nsanden its almost like its trying to add an extra slash at the end of my github url, but with git remote -v you can see i dont have it set that way
03:49 milki nsanden: git config -l
03:50 milki nsanden: o wait, no. its showing both fetch and push
03:50 milki >.
03:51 xorox90 joined #git
03:52 ojacobson nsanden: either the repo honestly doesn't exist on github, or you're logged in as a user who can't see it, or you're not logged in
03:52 nsanden ojacobson: im not logged in, it typically asks me to login on the git pull
03:52 nsanden repo definitely exists
03:53 k3rn31 joined #git
03:53 nsanden maybe i can clear git login cache or something
03:54 nsanden sure enough that worked
03:54 nsanden git credential-cache exit
03:54 nsanden thanks ojacobson. lead me to the right track
03:56 ki0 joined #git
04:05 xorox90 joined #git
04:07 xorox90 joined #git
04:09 fission6 joined #git
04:12 Kulrak joined #git
04:12 Kulrak joined #git
04:13 zivester joined #git
04:13 nilsi joined #git
04:13 rominronin joined #git
04:14 romerocesar joined #git
04:15 dmto joined #git
04:17 boombatower joined #git
04:18 Cabanossi joined #git
04:18 ahmedelgabri joined #git
04:21 jaguarmagenta joined #git
04:25 Rodya_ joined #git
04:27 warthog9 joined #git
04:30 choki joined #git
04:31 ajf- joined #git
04:31 allcentury joined #git
04:34 howdoi joined #git
04:35 dmto joined #git
04:37 dsdeiz joined #git
04:38 jumpman joined #git
04:39 sangy joined #git
04:41 jumpman joined #git
04:46 drodger joined #git
04:47 blackwind_123 joined #git
04:47 freimatz3 joined #git
04:48 sparetire joined #git
04:50 subhojit777 joined #git
04:55 elementalest joined #git
04:55 elementalest joined #git
04:57 MutantMahesh joined #git
05:02 Psych joined #git
05:05 lamont joined #git
05:07 jaguarmagenta joined #git
05:08 dmto joined #git
05:10 Corosus joined #git
05:12 Corosauce joined #git
05:13 MutantMahesh joined #git
05:14 rominronin joined #git
05:14 zincrokx joined #git
05:14 kugel_ joined #git
05:14 kugel_ joined #git
05:15 Corosauce joined #git
05:16 qt-x joined #git
05:17 rf_ joined #git
05:18 romerocesar joined #git
05:19 ahmedelgabri joined #git
05:20 tinajohnson___ joined #git
05:20 A124 joined #git
05:21 ewet joined #git
05:21 fracting joined #git
05:22 lvns joined #git
05:22 warthog9 joined #git
05:23 Psych joined #git
05:26 Rodya_ joined #git
05:27 clemf joined #git
05:27 Psych joined #git
05:29 sauvin joined #git
05:29 dreiss joined #git
05:30 jstimm joined #git
05:30 interne7y joined #git
05:32 allcentury joined #git
05:34 ays joined #git
05:35 jumpman joined #git
05:36 jumpman joined #git
05:37 jumpman joined #git
05:38 jumpman joined #git
05:38 Raging_Hog joined #git
05:40 jumpman joined #git
05:41 dmto joined #git
05:42 blackwind_123 joined #git
05:42 elastix joined #git
05:42 ThomasLocke joined #git
05:46 radsy joined #git
05:48 lvns joined #git
05:48 TomyLobo joined #git
05:52 inflames joined #git
05:53 jceb joined #git
05:54 peepsalot joined #git
05:55 lvns joined #git
05:59 blackwind_123 joined #git
06:01 apotry joined #git
06:02 nilsi joined #git
06:03 Macaveli joined #git
06:05 nnyk_ joined #git
06:07 rscata joined #git
06:08 Ch4rAss joined #git
06:11 fracting joined #git
06:13 emPi joined #git
06:14 stuh84 joined #git
06:15 eight58 joined #git
06:15 dopesong joined #git
06:15 rominronin joined #git
06:18 Sleepy63 joined #git
06:19 rainbyte joined #git
06:20 ahmedelgabri joined #git
06:20 ki0 joined #git
06:20 harish joined #git
06:20 Corosauce joined #git
06:21 ki0 joined #git
06:21 Corosus__ joined #git
06:22 ceaucari joined #git
06:26 Corosauce joined #git
06:26 rainbyte joined #git
06:27 Rodya_ joined #git
06:27 lvns joined #git
06:30 ochorocho__ joined #git
06:33 allcentury joined #git
06:33 dcg joined #git
06:37 Corosus__ joined #git
06:37 rominronin joined #git
06:38 skfax joined #git
06:39 ahmedelgabri joined #git
06:39 skfax When preserving a repository, does it make a difference whether I make a normal clone or a bare clone (except for how my file layout ends up looking)?
06:40 lb skfax no. you can always transform it into the other one with another clone (--bare)
06:40 lb skfax only difference in the list of remotes would occur if you use  --mirror . see man git clone
06:40 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
06:41 lb !backup
06: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.c​om/GitBestPractices/#backups
06:43 skfax lb: Thanks!
06:45 mase-tech joined #git
06:46 Sceorem joined #git
06:46 Psych joined #git
06:48 drodger joined #git
06:48 peroht joined #git
06:48 JeroenT joined #git
06:51 xbob joined #git
06:51 Oebele joined #git
06:52 eijk joined #git
06:53 netj joined #git
06:54 Ch4rAss joined #git
06:55 mehola joined #git
06:55 _xor I know git is not a deployment tool, so I'm looking for other free/open-source tools to look into using for deployment.  Recommendations/Suggestions?  I've heard of Capistrano, but what else?
06:56 sauvin joined #git
06:56 Rish joined #git
06:57 tvw joined #git
06:57 fracting joined #git
06:57 nnyk_ joined #git
06:58 kadoban I largely just keep it simple and use rsync
06:59 akiva joined #git
07:00 tgunr joined #git
07:01 Mobutils joined #git
07:02 jceb joined #git
07:03 Rish joined #git
07:07 Andrew_K joined #git
07:08 _xor kadoban: Yeah, that's an option.  I'm going to need to be able to run pre/post scripts though.
07:08 rbr joined #git
07:10 JeroenT_ joined #git
07:11 lvns joined #git
07:11 santa-fire joined #git
07:11 Corosauce joined #git
07:12 dan2k3k4 joined #git
07:12 TomyWork joined #git
07:19 encod3 joined #git
07:19 JeroenT joined #git
07:20 ahmedelgabri joined #git
07:20 circ-user-7QvWA joined #git
07:21 dreiss joined #git
07:22 romerocesar joined #git
07:23 ronskisika joined #git
07:23 muthu joined #git
07:23 sarbs joined #git
07:23 JeroenT_ joined #git
07:25 garethdaine joined #git
07:26 cyan__ joined #git
07:26 k3rn31 joined #git
07:27 jagob joined #git
07:28 Rodya_ joined #git
07:29 synthmeat joined #git
07:32 Raging_Hog joined #git
07:32 imjacobclark joined #git
07:34 allcentury joined #git
07:35 eletuchy_ joined #git
07:38 fscala joined #git
07:40 danieli joined #git
07:41 fees joined #git
07:41 leeN joined #git
07:43 ash_workz joined #git
07:47 leeN joined #git
07:47 SoRoot joined #git
07:49 garethdaine joined #git
07:49 Darcidride joined #git
07:49 slixpk joined #git
07:49 ToBeCloud joined #git
07:49 imjacobclark joined #git
07:52 JeroenT joined #git
07:52 mkoskar joined #git
07:55 boudicca joined #git
07:57 imjacobclark joined #git
07:59 GavinMagnus joined #git
08:00 ynanm joined #git
08:01 ocbtec joined #git
08:01 ecksit joined #git
08:03 kurkale6ka joined #git
08:04 mikecmpbll joined #git
08:05 garethdaine left #git
08:05 a_thakur joined #git
08:07 fluxdude joined #git
08:08 zeroed joined #git
08:08 zeroed joined #git
08:09 Psych joined #git
08:11 JeroenT joined #git
08:14 fluxdude left #git
08:20 PCatinean joined #git
08:21 ciampix joined #git
08:22 timini joined #git
08:22 Mobutils joined #git
08:23 emPi joined #git
08:23 alaa_ joined #git
08:25 alaa_ joined #git
08:25 diegoaguilar joined #git
08:25 stonerfish joined #git
08:27 rasto joined #git
08:28 mischat joined #git
08:28 harish_ joined #git
08:29 Rodya_ joined #git
08:30 mischat_ joined #git
08:31 Jellyg00se joined #git
08:33 maxorator joined #git
08:34 allcentury joined #git
08:35 MadHatter42 joined #git
08:35 alp82 joined #git
08:36 acetakwas joined #git
08:38 xorox90 joined #git
08:42 SonicJam joined #git
08:43 SonicJam joined #git
08:43 aloksteel joined #git
08:46 netcarver joined #git
08:47 diegoaguilar joined #git
08:47 rahtgaz joined #git
08:51 xorox90 joined #git
08:51 xfbs joined #git
08:52 jbitdrop joined #git
08:55 boudicca joined #git
08:56 kenansul- joined #git
08:56 courrier joined #git
08:57 mdw joined #git
09:01 notebox joined #git
09:02 digidog joined #git
09:02 irco joined #git
09:03 keltvek joined #git
09:05 watabou joined #git
09:05 doener joined #git
09:05 Schwarzbaer__ joined #git
09:06 mikecmpbll joined #git
09:06 JeroenT joined #git
09:12 Rish joined #git
09:12 ronskisika joined #git
09:13 akiva joined #git
09:14 jaguarma_ joined #git
09:20 Raging_Hog joined #git
09:21 mehola joined #git
09:21 nilg joined #git
09:23 romerocesar joined #git
09:29 simonect joined #git
09:31 ravenzz joined #git
09:31 fabio_ joined #git
09:31 ravenzz howdy
09:32 ravenzz if I add a custom header when I `git format-patch`, will it be included when I later do `git am`?
09:34 romerocesar joined #git
09:35 allcentury joined #git
09:35 MutantMahesh joined #git
09:36 mikecmpbll if i have two branches, each which have received several distinct commits, what's the easiest way to sync them (so that both branches are the same and contain all new commits received on each branch) ?
09:36 wrouesnel joined #git
09:37 ravenzz basically I would like to add a piece of information to each commit, is there a way to programmatically do it? (maybe i can automatically amend files and append this info to the commit message?)
09:38 nilsi joined #git
09:38 dopesong joined #git
09:40 mflow joined #git
09:40 joki joined #git
09:40 simonect left #git
09:43 Raging_Hog joined #git
09:44 SASDOE joined #git
09:46 SASDOE Hi. I am trying to understand which commit deleted production code. On bitbucket, I've found between which two commits the code was deleted. However, when viewing the first commit in which the code was deleted, it shows only two changes and does not show the deleted code as a modification.
09:49 SASDOE So how can code be deleted between two commits (no other commits on the file between these two commits), without showing up in the commit's modifications?
09:49 lb joined #git
09:50 SASDOE something like git merge --ours would show the code being removed right?
09:50 dsantiago joined #git
09:53 romerocesar joined #git
09:54 MadHatter42 joined #git
09:54 marksei joined #git
09:54 mehola joined #git
09:56 dsantiago joined #git
09:56 kenansulayman joined #git
09:57 nilsi joined #git
09:58 bruce_lee joined #git
09:59 roflin joined #git
10:01 roflincopter joined #git
10:02 interne7y joined #git
10:02 Chinorro_ joined #git
10:02 grawity SASDOE: what does the commit look like in `gitk` or `tig`?
10:02 lss8 joined #git
10:02 grawity sometimes, different apps show merge commits in different ways
10:02 grawity assuming it is a merge commit in the first place
10:03 roflin_ joined #git
10:03 SoRoot joined #git
10:04 romerocesar joined #git
10:09 FrontPsych joined #git
10:10 u1106 joined #git
10:12 fabio_ joined #git
10:13 fabio_ left #git
10:13 SASDOE grawity: Still only shows a couple lines edited, not a whole block of code removed
10:13 fabio_ joined #git
10:20 raijin joined #git
10:21 Balliad joined #git
10:23 texinwien joined #git
10:23 nnyk_ joined #git
10:24 maziar joined #git
10:24 maziar hello i have a 680 MB file to push
10:25 bremner sounds like a pretty terrible idea.
10:26 grawity it is a pretty terrible idea
10:27 fabio_ left #git
10:28 MadLamb joined #git
10:29 maziar hello i have a 680 MB file to push, and i'm installed git LFS , but i get this error, why ?
10:30 lb maziar a little info would be helpful. besides, it's a pretty terrible idea
10:32 imjacobclark joined #git
10:32 ochorocho__ joined #git
10:34 romerocesar joined #git
10:35 grawity maziar: um, *what* error exactly
10:35 grawity lb: well, that's what they're using git-lfs for I guess
10:36 allcentury joined #git
10:37 bremner yes, would be helpful to mention that from the start.
10:37 bremner then we could save one round of "what!?!"
10:37 BtbN I'd guess you are using github then. They only give you 1GB of storage for free. So if you handle files that large, you probably just ran out of space.
10:38 BtbN Anyway, LFS is not part of git, so better ask github about it.
10:38 maziar hello i have a 680 MB file to push, and i'm installed git LFS , but i get this error, why ?    >>>> error : http://pastebin.com/ZWd7mAVk
10:39 sdothum joined #git
10:39 BtbN maziar, did you even read what it tells you?
10:39 lb maziar lol, read the error message
10:39 BtbN Also, you're not using LFS. You're just trying to push a huge file. And Github says no.
10:41 maziar BtbN i read and i use the LFS documents, but its not works yet
10:44 dzho joined #git
10:44 radsy joined #git
10:46 Literphor joined #git
10:46 lb ask #github if you cannot get lfs running
10:47 nnyk_ joined #git
10:48 JeroenT joined #git
10:50 marksei_ joined #git
10:50 jeffreylevesque joined #git
10:51 ahr3n joined #git
10:52 perlpilot joined #git
10:52 evanc joined #git
10:55 njbair joined #git
10:55 AndreSomers joined #git
10:57 seitensei joined #git
10:59 maxorator joined #git
11:00 yqt joined #git
11:00 bouncy joined #git
11:01 lmatteis hi guys
11:01 lmatteis i usually `git rebase mybranch`
11:01 lmatteis i did it once, and fixed bunch of conflicts
11:01 lmatteis now i did it again (while mybranch only changed a couple files) and it's asking me to resolve the same conflicts all over again
11:01 lmatteis what should i do?
11:04 Gloomy joined #git
11:04 SoRoot joined #git
11:04 santa-fire joined #git
11:04 romerocesar joined #git
11:05 lb lmatteis i can't help with your specific problem, but if that happens more often to you, have a look at git rerere : https://git-scm.com/2010/03/08/rerere.html
11:06 jhass (or in the book https://git-scm.com/book/en/v2/Git-Tools-Rerere)
11:06 k3rn31 joined #git
11:06 lmatteis maybe i should do it differently
11:06 tlaxkit joined #git
11:07 lmatteis i have `myfork` which is a branch "ahead" of `master` say
11:07 lmatteis master gets modified, and i want `myfork` to stay updated. so i do `git rebase master` on `myfork`
11:08 jhass that's a valid workflow
11:08 bouncy joined #git
11:09 lmatteis hrm but this `rerere` doesn't seem standard
11:09 pluszak joined #git
11:10 acetakwas joined #git
11:10 bremner afaik it is
11:11 lb lmatteis see man git rerere scroll to the bottom of the man page ;)
11:11 gitinfo the git-rerere manpage is available at http://jk.gs/git-rerere.html
11:11 lb Part of the git(1) suite
11:11 pluszak Is there any way to make git push ignore "remote ref does not exist" when trying to delete a lot of branches?
11:12 acetakwas joined #git
11:16 bouncy joined #git
11:16 johnmilton joined #git
11:16 jimi_ joined #git
11:19 j`ey joined #git
11:19 bouncy joined #git
11:20 j`ey I have a git repo, and 99% of the time I'm working in one folder (imagine it's a git repo that contains 2 projects)
11:20 j`ey is there a way to run 'git diff' or git show, and have the paths show, relative to where I currently am?
11:21 Kurvivor joined #git
11:24 allcentury joined #git
11:24 Kurvivor hello! i have made a mistake and made a commit after switching branches, so it went to the wrong one
11:25 lb j`ey man git config -> status.relativePaths
11:25 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
11:25 Kurvivor my branches are one right on top of another
11:25 j`ey lb: thanks
11:25 Kurvivor how can i move commit from one branch to another?
11:26 j`ey lb: that seems to just be for status?
11:26 lb Kurvivor pushed yet?
11:26 lb j`ey ay sorry, didn't read fully sorry.
11:26 Kurvivor it currently is like [br1]C1 -> C2 -> [br2]C3, i want it to become C1 -> C2[br1] -> [br2]C3
11:27 Kurvivor lb: no, it is all local
11:27 rnsanchez joined #git
11:27 kenansulayman joined #git
11:27 Infamous joined #git
11:27 lb Kurvivor and workdir is clean?
11:28 deadnull_ joined #git
11:28 Kurvivor lb: not really, but those are changes i am not going to commit in any case. I could probably stash them painlessly
11:29 lb Kurvivor if workdir is clean, i would just checkout the correct branch, cherry-pick the commit in question, checkout the branch where it doesn't belong and reset that branch back
11:29 lb but there are more possible ways. see !fixup
11:29 gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
11:29 bouncy joined #git
11:30 Kurvivor lb: i see. Thanks, i will look there
11:30 clmsy joined #git
11:30 freimatz joined #git
11:31 jaguarmagenta joined #git
11:33 barteks2x joined #git
11:33 cdown joined #git
11:34 eijk joined #git
11:35 romerocesar joined #git
11:35 kinnie joined #git
11:36 cdown joined #git
11:37 raijin joined #git
11:38 fission6 joined #git
11:39 watabou joined #git
11:41 nilsi joined #git
11:48 bnnb joined #git
11:49 kenansul- joined #git
11:49 nnyk_ joined #git
11:51 Infamous joined #git
11:51 fscala joined #git
11:56 asimzaidi joined #git
11:56 GavinMagnus joined #git
12:02 SoRoot joined #git
12:02 Sceorem joined #git
12:02 Literphor joined #git
12:02 interne7y joined #git
12:04 hhee joined #git
12:05 romerocesar joined #git
12:05 k3rn31 joined #git
12:07 acetakwas joined #git
12:09 rwb joined #git
12:10 Psychiatrist joined #git
12:11 mizu_no_oto joined #git
12:12 Infamous- joined #git
12:12 kenansul| joined #git
12:13 m_antis joined #git
12:15 synthroid joined #git
12:15 troulouliou_div2 joined #git
12:17 ahmedelgabri joined #git
12:17 matrixa1 joined #git
12:23 achadwick joined #git
12:24 suigeneris joined #git
12:24 flaguy48 left #git
12:26 rossome joined #git
12:31 ahmedelgabri joined #git
12:32 MadLamb joined #git
12:33 lordjancso joined #git
12:33 lordjancso hi
12:34 lordjancso whats the best practice when i finished with a feature branch and merged it to the development? to delete the feature branch from the repository physically?
12:34 jeffreylevesque joined #git
12:35 romerocesar joined #git
12:36 kenansulayman joined #git
12:36 Infamous joined #git
12:38 flaguy48 joined #git
12:41 moritz yes (though I don't know what "phyiscally" means in the context of git)
12:42 Rish joined #git
12:43 rgrinberg joined #git
12:43 ahmedelgabri joined #git
12:43 sangy joined #git
12:45 ronskisika joined #git
12:45 infra-red joined #git
12:45 grawity `git branch -d/-D` deletes the branch name (the ref), which tells Git that it can now delete the actual data (commits, etc.) previously associated with it
12:45 grawity though the latter only happens "sometime later", not immediately
12:46 boudiccas joined #git
12:46 jhass never if it was fully merged
12:47 drodger joined #git
12:50 Raging_Hog joined #git
12:53 Balliad joined #git
12:54 fmcgeough joined #git
12:55 drodger joined #git
12:55 Ryanar joined #git
12:55 FeyFre joined #git
12:55 italoacasas joined #git
12:56 Ryanar if I have a working directory and want to discard all changes and just checkout and fetch a branch from the server do I just git checkout and fetch in the current repository or should I rm -rf first
12:56 italoacasas joined #git
12:56 Sleepy63 joined #git
12:58 jimi_ joined #git
12:58 grawity `git checkout -f` would throw away everything and return to HEAD
12:58 grawity (and `git clean -fdx` if you want to remove untracked files)
12:58 grawity then you can do whatever
12:59 grawity depending on the value of 'whatever', there often are faster ways, but you got to ask for something more precise
12:59 FeyFre maybe question out of scope, but: anyone have idea how to resolve merge conflicst in stash?
13:00 dstarh joined #git
13:01 fission6 joined #git
13:02 perlpilot FeyFre: what do you mean by "in stash"?  AFAIK, stash is just another git repo.  Ordinarily you'd solve them locally, then push your changes.
13:02 cdg joined #git
13:03 ahmedelgabri joined #git
13:03 FeyFre perlpilot: problem is, source branch is release branch, I cannot "solve" there anythink.
13:03 jstimm joined #git
13:03 FeyFre root of problem is cherry-pick actually
13:05 suigeneris left #git
13:05 romerocesar joined #git
13:06 cbreak FeyFre: just solve them normally
13:06 cbreak FeyFre: then git stash drop
13:06 FeyFre cbreak: what means "normally"?
13:06 espindola joined #git
13:06 cbreak with a text editor, or git mergetool
13:07 cbreak git stash will create similar conflict markers as a failed merge when an apply fails
13:07 FeyFre stash does not give me any edit tool to solve conflict.
13:07 cbreak FeyFre: irrelevant
13:07 cbreak use vim or what ever
13:08 FeyFre cbreak: atlassian stash. web UI. what kind of VIM there?
13:08 cbreak no, git stash
13:08 j`ey left #git
13:08 zivester joined #git
13:08 cbreak never heard of that atlassian stash thing
13:09 eycsigfy joined #git
13:09 osse eycsigfy: git symbolic-ref HEAD
13:09 jasondotstar joined #git
13:09 cbreak man git-stash for details
13:09 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
13:09 FeyFre cbreak: https://www.atlassian.com/​software/bitbucket/server aka Bitbucket
13:10 eycsigfy osse: and then I would just pull the 12th character on?
13:10 eycsigfy osse: because I assume refs/heads/ is standard notation for current working branch?
13:11 osse eycsigfy: git symbolic-ref --short HEAD
13:12 osse eycsigfy: all branches, tags and all other forms of references start with refs/. All local branches start with refs/heads
13:12 eycsigfy osse: ah, perfect. Thank you for the help.
13:13 semantipc joined #git
13:15 semantipc joined #git
13:15 livingstn joined #git
13:15 ash_workz joined #git
13:16 * perlpilot wonders if atlassian renamed stash because of the conflation with stashes in git or if they were mostly rallying behind the "bitbucket" brand
13:16 wviana joined #git
13:18 Infamous joined #git
13:18 fission6 i alway forget the name of the last branch i was working on, is there a way to show the branches last worked on / modified
13:18 kenansul- joined #git
13:19 Gamecubic joined #git
13:19 rnsanchez_ joined #git
13:19 mase-tech joined #git
13:19 grawity git branch -vv --sort=committerdate
13:21 a_thakur joined #git
13:21 JeroenT joined #git
13:22 bittin joined #git
13:22 dsdeiz joined #git
13:22 dsdeiz joined #git
13:22 ays joined #git
13:23 dopesong_ joined #git
13:23 cbreak fission6: git checkout - ? :)
13:24 Ryanar_ joined #git
13:24 Gonzo89 joined #git
13:26 romerocesar joined #git
13:26 fission6 what does that do cbreak
13:27 cbreak it switches to the previous branch. like cd - in a shell switches to the previous directory
13:28 intellix joined #git
13:28 FeyFre left #git
13:29 apathor joined #git
13:29 pol123456 joined #git
13:29 crose joined #git
13:31 happy-dude joined #git
13:32 jaguarmagenta joined #git
13:33 CEnnis91 joined #git
13:33 espindola joined #git
13:37 nowhere_man joined #git
13:38 fission6 cbreak: ahh i see thank you!
13:39 leeN joined #git
13:40 livingstn joined #git
13:41 mdw joined #git
13:43 mdw joined #git
13:43 Bhalddin joined #git
13:44 mdw joined #git
13:44 anu0 joined #git
13:45 dsdeiz joined #git
13:45 dsdeiz joined #git
13:45 mischat joined #git
13:47 frem_ joined #git
13:47 TheVoid joined #git
13:48 cbreak I think it works via the HEAD reflog
13:50 ceaucari joined #git
13:51 livingstn joined #git
13:52 mischat_ joined #git
13:52 phaleth joined #git
13:52 rolha joined #git
13:52 Rish joined #git
13:53 dsdeiz_ joined #git
13:53 chachasmooth joined #git
13:54 eycsigfy Any reason why git stashing with no changes to stash returns a 0 while git stash pop will return a 1 if there is nothing to pop?
13:54 eycsigfy Just curious, really.
13:55 semantipc joined #git
13:56 SoRoot joined #git
13:56 romerocesar joined #git
13:58 k3rn31 joined #git
13:58 al-damiri joined #git
14:00 Psychiatrist joined #git
14:01 AaronMT joined #git
14:04 interne7y joined #git
14:04 Rish joined #git
14:06 Sonder joined #git
14:06 kaldoran joined #git
14:06 romerocesar joined #git
14:07 dopesong joined #git
14:07 snfgf joined #git
14:08 imjacobclark joined #git
14:09 axiom_1 joined #git
14:10 ResidentBiscuit joined #git
14:11 FeersumEndjinn joined #git
14:13 robotroll joined #git
14:16 rolha joined #git
14:18 santa-fire joined #git
14:18 Psychiatrist joined #git
14:20 espindola joined #git
14:21 MutantMahesh joined #git
14:22 jost__ joined #git
14:23 semantipc joined #git
14:23 d10n-work joined #git
14:26 Sonderblade joined #git
14:26 espindola joined #git
14:26 romerocesar joined #git
14:30 Rish_ joined #git
14:30 dan2k3k4 joined #git
14:30 espindola joined #git
14:31 svankmajer joined #git
14:33 Rodya_ joined #git
14:33 rlist joined #git
14:34 Oebele joined #git
14:35 livingstn joined #git
14:35 rominronin joined #git
14:35 asimzaidi joined #git
14:35 Ahmed90 joined #git
14:37 Infamous joined #git
14:37 kenansulayman joined #git
14:40 GavinMagnus joined #git
14:43 kpease joined #git
14:44 doener joined #git
14:46 thiago joined #git
14:48 FeersumEndjinn left #git
14:53 fees joined #git
14:53 JeroenT joined #git
14:54 zivester joined #git
14:56 diegoviola joined #git
14:56 clemf joined #git
14:57 romerocesar joined #git
14:57 dhollinger joined #git
15:00 toogley joined #git
15:03 quenode joined #git
15:04 LeMike joined #git
15:04 squaresurf joined #git
15:05 Rish joined #git
15:05 harish_ joined #git
15:07 docnvk joined #git
15:07 Grimm_ joined #git
15:07 eijk joined #git
15:07 SonicJam joined #git
15:08 mizu_no_oto joined #git
15:09 blackwind_123 joined #git
15:10 bango2 joined #git
15:12 TomyLobo joined #git
15:13 sylario joined #git
15:14 sangy joined #git
15:14 cyan__ joined #git
15:14 tjone270_ joined #git
15:16 sylario I am trying to participate in an OS project, and on my local branch, while i was working on a new feature, I frequetly updated new master changes, but now, if i try to submit my change the changes includes all the changes from master i pulled during dev. It seems only thing i can do is make a new repo from master, reapply my changes and submit them? WHat did
15:16 sylario i miss?
15:17 romerocesar joined #git
15:17 Eugene sylario - it sounds like you did a pull=fetch+merge rather than fetch+rebase to keep up-to-date with the current state of the upstream master
15:18 sylario what?
15:18 Eugene !flow
15:18 gitinfo [!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-succ​essful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for other workflow suggestions/references
15:18 Ali2 joined #git
15:18 Eugene There's some pretty graphs that explain a bit how feature branches are usually used ^
15:19 Eugene Basically, you merged-in the changes as you went, so they're in your branch
15:19 rolha joined #git
15:19 Eugene If you don't want that then don't do that
15:20 perlpilot sylario: But ... why are you worried about it exactly?  If the changes are already in master, you just have some spurious merge commits that should hurt much.  (though it makes bisecting a pain if you do that)
15:20 sylario I am not in charge
15:20 sylario And it add like 12/15 commits
15:21 nedbat sylario: perhaps you want to rebase?
15:21 Eugene !sausage explains how to make your feature branches pretty in prep for merging back to a project
15:21 gitinfo [!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
15:21 King_Hual joined #git
15:21 sylario ok so when you do a feature you never never pull from master as long as you have not pushed
15:21 hashpuppy joined #git
15:21 Eugene When you do a feature, make a feature branch. Don't merge into that branch until its done.
15:22 Eugene If you want to update it you can use rebase instead.
15:22 shgysk8zer0 joined #git
15:22 Eugene Also, note the difference between merge/rebase and !pull
15:22 gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull:  http://longair.net/blog/2009​/04/16/git-fetch-and-merge/
15:22 rkazak joined #git
15:23 perlpilot pull has an option to rebase instead of merge too.
15:23 Eugene Yes, the factoid says that ;-)
15:23 Ali2 guys, as a college student in IT, I need one solid advice. is OS X worth the money over linux?
15:23 perlpilot yes, Eugene++  (I'm only half paying attention right now :)
15:23 sylario ok so i will look into rebase.
15:24 perlpilot Ali2: depends on what you want to do.
15:24 sylario Thanks for the help, it seems what was missing is the rebase command
15:24 LionsMane joined #git
15:24 Eugene Ali2 - my personal preference is for Windows as a laptop/desktop. OS X is shiny, but it's not worth the money by itself. However, Apple's hardware is hands-down the best-built and longest-lasting in the industry
15:24 Ali2 perlpilot, what activities are good for linux and os x when comparing??
15:25 perlpilot Ali2: If you need good graphics, you probably want OSX
15:25 Ali2 Eugene, how about linux as compared to OS X?
15:25 Eugene I do all of my *nix work through a SSH session, so the OS installed on my keyboard+screen is immaterial
15:25 Eugene I find linux to be an absolute nightmare shit-show as a GUI OS and do not recommend it at all
15:25 perlpilot Ali2: Really, OSX is just *BSD underneath, so it's almost like linux for terminal stuff
15:26 sylario Ali2> Hardware wise, it is way more expansive, a 1900€ dell will cost 2600 on applestore and you will have a smaller SSD and an integrated GC instead of a 2GoNvidia
15:26 grawity really? I thought it was mostly Mach with some BSD
15:26 cqi joined #git
15:26 hobodave joined #git
15:26 Ali2 sylario, so you don't recommend mac right
15:26 Eugene The OS X kernel is not open-source, so detailed analysis is not really possible. It's UNIX-like ;-)
15:27 fracting joined #git
15:27 Ali2 I don't care about the hardware. asking about the software. OS X or linux.
15:27 perlpilot Ali2: I have never purchased a Mac for myself, but I have always been happy with the Macs I have used for work (even "low-end" or hand-me-down machines) running OSX
15:27 sylario Ali2: no, because some people are ok to pay the price because of the software ecosystem, like editing movies and some software available only on mac
15:27 diogenese joined #git
15:27 Eugene It's really neither here nor there, as you're never ever going to run a server against OS X(unless you're lunatics like Imgix)
15:27 grawity on the contrary, AFAIK the OS X kernel is one of the few parts that *are* open-source
15:28 Eugene Really? Now I'm curious.
15:28 ochorocho__ joined #git
15:28 sylario Ali2:  if you pla to do dev with a CLI + Sublime or atom or eclipse, Linux and OSX are the same
15:29 Ali2 sylario, I have seen programmers in conferences using macbooks
15:29 Ali2 so I am curious whether its better than linux.
15:29 sylario Ali2:  i know, it is the same as linux
15:29 Eugene Macbooks are a culture thing
15:29 sylario Once again on dev itself it is almost identical, it depend of your other use
15:30 perlpilot Ali2: you can't just ask "is it better", you have to have a purpose in mind. You can't compare them in a vacuum.
15:30 Ali2 I dont care about photoshop or designing programs
15:30 shinnya joined #git
15:30 Ali2 Oh I see. perlpilot
15:30 sylario You do not care about omnifocus or textmate?
15:31 sylario And syncing an iphone
15:31 sylario if no, take a PC
15:31 Ali2 ^ that I care about
15:31 sylario iphone?
15:31 perlpilot sylario: you can do that on linux last time I checked.   It's not a seamless as with OSX, but you can do it.
15:31 dir joined #git
15:31 Ali2 yea and GUI softwares u described
15:32 Ali2 have heard that OS X is better when it comes down to productivity
15:33 ResidentBiscuit What's the proper thing to do when you have two branches that are not reviewed or merged into master, but one of the branches is needing the changes of the other branch? Is there a good way to pull in another branches just temporarily?
15:33 jaguarmagenta joined #git
15:33 sylario perlpilot: probably, either way I do not really sync my phone, thanks to the wizadry of the cloud.
15:33 perlpilot sylario: yeah, welcome to the future ;)
15:33 phy1729 ResidentBiscuit: put one branch on top of the other?
15:33 perlpilot ResidentBiscuit: why temporarily?
15:33 Ali2 sylario, you use
15:34 Ali2 os x?
15:34 sylario I use Linux and windows
15:34 Rodya_ joined #git
15:34 ResidentBiscuit They're both still in development, so eventually they will both need to rebase onto master and squash out the development commits
15:34 dgenr8 joined #git
15:34 Ali2 for iCloud I need to purchase additional gbs
15:34 Ali2 :(
15:34 kenansul- joined #git
15:34 Ali2 sync would be a free option
15:34 Rish joined #git
15:34 jimi_ If I do git diff --stat HEAD HEAD~1 | grep '\.php'   i get full paths like foo/bar/baz   but if i pipe it into another program like less, or something else, i get the full path for the first entry and like ../short path/ for the second etc is this a setting or flag?
15:35 Infamous joined #git
15:35 dgenr8 in the middle of resolving conflicts for a cherry-pick, I find I want to cherry-pick another commit first.  what's the best way to do this?
15:35 jimi_ oh I'm an idiot, its because of column width
15:35 perlpilot ResidentBiscuit: if branch A needs stuff from branch B, that doesn't sound temporary t o me.
15:38 ResidentBiscuit perlpilot: Well, Branch B is in development still. I don't think we want to pull someone elses development code into a different branch. We would end up with a bunch of random commits we don't want, and then merging is going to be headache
15:38 SimonK joined #git
15:39 shgysk8zer0 joined #git
15:40 pety joined #git
15:40 tyreld joined #git
15:41 mablae joined #git
15:42 dreiss joined #git
15:43 watabou joined #git
15:47 madewokherd joined #git
15:47 romerocesar joined #git
15:49 rueben_ joined #git
15:49 kre10s_ joined #git
15:49 Sleepy63 joined #git
15:50 kre10s_ Hello. I just did a git format-patch -s and I get a header with From cfeafe997a33056494354ae97427264775e69362 Mon Sep 17 00:00:00 2001 ... why is this date so wrong?
15:50 BlaXpirit joined #git
15:51 grawity because nobody really cares about the date in the From_ line
15:51 grawity but some things do require it to be in the correct *syntax*
15:53 kre10s_ ah. ok.  I also noticed that format-patch and format-patch -s produce the same output. So signoff is just the default?
15:53 ncthom91 joined #git
15:53 CheckDavid joined #git
15:54 wviana_ joined #git
15:55 erebel55 joined #git
15:56 grawity usually no
15:56 grawity but it can be enabled by default via `git config`
15:56 grawity and I'm not sure -s does anything if the commit itself has signoffs
15:56 jceb joined #git
15:57 tgunr joined #git
15:57 timmu joined #git
15:57 benwbooth joined #git
15:58 rahtgaz joined #git
15:58 LeBlaaanc joined #git
15:58 peepsalot joined #git
15:59 benwboot_ joined #git
16:01 erebel55 I am trying to merge a pull request that is based on a newer branch then the one that I want to merge into. What is the best way to go about that?
16:02 erebel55 *than
16:03 barteks2x joined #git
16:03 grawity ask the submitter to rebase it on top of the correct branch
16:04 erebel55 I am not a maintainer. I mean I want to merge it locally
16:04 fscala joined #git
16:05 grawity I think *you* should rebase it then
16:05 interne7y joined #git
16:05 erebel55 his is on the correct branch (release). But I am on an older branch
16:05 erebel55 okay
16:07 erebel55 so fetch the PR, checkout the PR, rebase
16:07 erebel55 I'll try that
16:12 OliverJAsh joined #git
16:12 dan2k3k5 joined #git
16:12 troulouliou_div2 joined #git
16:12 subhojit777 joined #git
16:13 kenansulayman joined #git
16:14 axl_ joined #git
16:15 Infamous joined #git
16:17 freimatz joined #git
16:17 romerocesar joined #git
16:18 notebox joined #git
16:18 tomog999_ joined #git
16:20 Lynxium joined #git
16:22 erebel55 oh man so many conflicts :(
16:22 xanadu_ joined #git
16:22 imachuchu joined #git
16:23 kpease joined #git
16:25 wviana joined #git
16:25 freimatz joined #git
16:32 ediz_ joined #git
16:34 freimatz joined #git
16:34 erebel55 hmm maybe cherry picking is what i want
16:34 Rodya_ joined #git
16:35 eight58 joined #git
16:35 rolha joined #git
16:36 narendraj9 joined #git
16:37 mdw joined #git
16:39 Xaratas joined #git
16:42 freimatz joined #git
16:42 durham joined #git
16:42 boshhead joined #git
16:43 durham joined #git
16:43 Xaratas i want to bisect the linux kernel between 3.16 and 3.17-rc1 (13k commits) to find the cause of a bug, but there is a range of commits which is not buildable. Can i do a "sort of bisect" and say git "give me v3.16 + 1000 commits"?
16:44 grawity doesn't `git bisect skip` deal with that?
16:44 watabou joined #git
16:44 grawity though, feel free to manually check out any commit and build it
16:44 boshhead So I created some files (without committing, they are currently untracked), but I've decided I don't want them. How do I get back to my last commit? I've tried a couple things like git reset --hard, but when I do a 'git status' the files are still there.
16:44 grawity boshhead: `git clean -fdx`
16:44 grawity start with -ndx though, to make sure
16:44 nitin_ joined #git
16:44 grawity -fdx actually deletes them
16:45 boshhead grawity: thanks!
16:46 lvns joined #git
16:48 romerocesar joined #git
16:48 Xaratas grawity: skip skips one commit, but i don't know where the build problem beginns, and ~ only goes backward
16:49 AndreSomers joined #git
16:49 ki0_ joined #git
16:49 cwillu_at_work joined #git
16:50 freimatz joined #git
16:50 grawity then do `git bisect visualize` and pick a random commit
16:50 watabou joined #git
16:50 grawity in general though, no, there is no syntax for "x + 1000"
16:50 grawity only for going backwards
16:51 erebel55 how can I cherry-pick a commit that was done to a different branch?
16:51 bremner by hash
16:51 Xaratas ok
16:52 wakejagr joined #git
16:52 wakejagr joined #git
16:54 erebel55 do i have to fetch the branch first?
16:55 grawity yes
16:56 Sound joined #git
16:56 cyan__ joined #git
16:57 nidr0x joined #git
16:57 pwnz0r joined #git
16:57 CheckDavid joined #git
16:58 romerocesar joined #git
16:58 freimatz joined #git
16:59 SwiftMatt joined #git
17:01 AaronMT_ joined #git
17:01 MacWinner if I havea branch, and master has moved forward, is there a way to rebase my branch so that it has teh new changes to master.. ?
17:02 Bombe MacWinner, I feel like this is a trick question because “just rebase your branch on master” contains only words you already had in your question.
17:02 LeMike joined #git
17:02 MacWinner if ai rebase on mster, doesn't that merge my branch into master?
17:03 MacWinner i want to continue developing on my branch, but I want the changes to master to reflected in my branch
17:03 MacWinner as iff all my branch chages were applied to the current master
17:03 _ikke_ MacWinner: No, rebasing master leaves master aline
17:03 _ikke_ rebasing on master*
17:03 nilg joined #git
17:05 dreiss joined #git
17:06 Bombe MacWinner, there are two ways to get the changes from master into your branch. a) rebase your branch on master, b) merge master into your branch. Both operations will not change master but only your branch.
17:06 Bombe Basically, it’s a matter of personal preference what you choose.
17:06 notebox joined #git
17:08 erebel55 cherry picking is awesome :)
17:08 rolha joined #git
17:09 MacWinner thanks!
17:10 espindola joined #git
17:12 mizu_no_oto joined #git
17:12 kenansulayman joined #git
17:12 Infamous joined #git
17:14 SwiftMatt joined #git
17:16 _ikke_ erebel55: rebasing is a form of cherry-picking
17:16 erebel55 that's what I figured
17:17 erebel55 but cherry picking seemed easier for my nooby self
17:18 ays joined #git
17:19 ec joined #git
17:20 shgysk8zer0 joined #git
17:21 mostlybadfly joined #git
17:22 irco joined #git
17:23 thiago joined #git
17:24 EvilPenguin joined #git
17:25 macefr joined #git
17:25 themayor joined #git
17:27 notebox joined #git
17:28 jceb joined #git
17:28 romerocesar joined #git
17:29 espindola joined #git
17:31 rath joined #git
17:31 ajf- joined #git
17:33 Infamous- joined #git
17:33 kenansul- joined #git
17:35 ajf- joined #git
17:35 ash_workz joined #git
17:35 Rodya_ joined #git
17:39 stonehammer left #git
17:39 belak joined #git
17:42 help123 joined #git
17:45 ToBeCloud joined #git
17:46 rwb joined #git
17:50 espindola joined #git
17:52 Sasazuka joined #git
17:52 shgysk8zer0 joined #git
17:54 ceaucari joined #git
17:54 kutsuya joined #git
17:56 dreiss joined #git
17:56 ajf- joined #git
17:57 kenansul- joined #git
17:57 baraba_ joined #git
17:57 texinwien joined #git
17:59 serapath joined #git
17:59 Literphor joined #git
17:59 emx joined #git
18:01 cdown joined #git
18:01 dopesong joined #git
18:02 invisbl_ joined #git
18:02 shgysk8zer0 joined #git
18:05 ahmedelgabri joined #git
18:06 robinsmidsrod joined #git
18:06 morenoh149 joined #git
18:07 morenoh149 how do I pull in a branch on a remote repo? I borked my local copy and deleted the branch locally
18:07 kutsuya joined #git
18:07 _ikke_ git fetch
18:07 _ikke_ git branch -r should show it
18:08 _ikke_ Note that, when you delete a branch, you only remote a pointer
18:08 _ikke_ all the commits are still there
18:08 mdw joined #git
18:08 morenoh149 and so, how would I reconstruct the local pointer?
18:10 aseidl joined #git
18:10 morenoh149 _ikke_: if git branch -r shows origin/foo how would I restore a local branch pointer named foo ?
18:10 grawity git branch foo origin/foo
18:11 grawity though, `git checkout foo` should automagically create one anyway
18:11 grawity (that's probably how you got it in the first place)
18:11 grawity I mean, those "local pointers" don't exist by default
18:12 rath joined #git
18:13 keyan joined #git
18:14 nwkj86 joined #git
18:15 pampeho joined #git
18:15 dr_leppe1 joined #git
18:15 fabio_ joined #git
18:16 przemoc joined #git
18:17 mischat joined #git
18:17 paddy_ joined #git
18:18 tomboy64 joined #git
18:19 bcardarella joined #git
18:19 mischat joined #git
18:20 pampeho joined #git
18:21 tobiasBora joined #git
18:21 semantipc joined #git
18:22 EvilPenguin joined #git
18:22 anu1 joined #git
18:24 LionsMane joined #git
18:24 Raging_Hog joined #git
18:24 yqt joined #git
18:26 McNozes joined #git
18:27 mizu_no_oto joined #git
18:28 watabou joined #git
18:28 Orion3k joined #git
18:29 asimzaidi joined #git
18:29 sq-one joined #git
18:29 pwnz0r_ joined #git
18:33 nilsi joined #git
18:33 semantipc joined #git
18:35 diegoaguilar joined #git
18:36 Rodya_ joined #git
18:38 fission6 how can i see all changes to a certain file, i am trying to see if there was ever a block of code which existed
18:39 edude03 joined #git
18:39 espindola joined #git
18:39 dr_lepper joined #git
18:40 grawity git log --follow -p <path>
18:40 grawity also, -G for code search
18:41 hhee hey! guys i have scheme - 1. git repo (bitbucket) 2. testing server 3. production server. i develop on local station. how can i deploy code to testing server and production servers?
18:41 hhee most truly way for it
18:41 hhee LAMP stack
18:42 perlpilot hhee: with something like ansible maybe?
18:42 perlpilot or capistrano
18:42 multi_io joined #git
18:42 perlpilot or maybe docker
18:42 dsdeiz joined #git
18:43 hhee perlpilot, ok. but ansible action will be like - git pull on webserver directory? sometimes DB scheme also changing. what can i do for automation in this case?
18:43 sanketdg joined #git
18:45 nilg joined #git
18:46 Schwarzbaer joined #git
18:46 grawity see !deploy for the Git part
18:46 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
18:46 grawity as for the DB schema, that's not a Git issue
18:47 grawity some frameworks support automatic schema migration
18:48 runlevl4 joined #git
18:48 Lynxium[] joined #git
18:49 svankmajer joined #git
18:49 svankmajer joined #git
18:49 hhee grawity, thx got it. as for DB - which tool can i use for it?
18:50 hhee smth like jenkins or self crafted scripts?
18:50 hhee i want that you tell me. guys, most true way for it :)
18:51 clemf joined #git
18:52 grawity this is #git. we have nothing to do with databases, nor with the code you wrote
18:52 Lynxium joined #git
18:55 Aiaek joined #git
18:56 Ahmed90 joined #git
18:57 kadoban joined #git
18:59 paul424 joined #git
18:59 hhee grawity, got it (sorry)
19:00 mgoodwin joined #git
19:00 mgoodwin Best way to keep unstaged changes in sync with another computer? Throw it in owncloud? Unison?
19:00 grawity stage them, commit -m "WIP"
19:01 grawity branches are cheap
19:01 mgoodwin staging removes it from the work tree though
19:01 mgoodwin What good will that do m e
19:01 mgoodwin sorry, I read "stash"
19:01 mgoodwin nevermind
19:02 mgoodwin No I don't really want to do that
19:02 WayToDoor joined #git
19:02 neachdainn mgoodwin: I use Unison for keeping machines in sync. If you really want to go outside of Git, I can say that Unison will work
19:03 neachdainn Branches are cheap, though
19:03 _ikke_ mgoodwin: why not?
19:03 gws joined #git
19:03 _ikke_ mgoodwin: (honest question)
19:03 mgoodwin Dudes, I get the "branches are cheap" mantra
19:03 mgoodwin I use them all the time for projects
19:04 mgoodwin Now, in this case It's me getting my butt off the couch and at my desk for work
19:04 mgoodwin I don't want to bother with comitting I just want the unstaged changes to be there
19:04 sPiN joined #git
19:04 mgoodwin Some things I don't want to be in the index / recorded history, period
19:04 slayerjain joined #git
19:04 bremner well, you can't always get what you want./
19:05 bremner or you have to use some other tool than git to do it
19:05 mgoodwin Of course, but that doesn't negate trying
19:05 mgoodwin Right, I intended to need something else
19:05 fabio_ left #git
19:06 gws mgoodwin: delete the branch and then git gc --prune=now ?
19:07 editshare-ericf joined #git
19:08 mgoodwin I suppose if I use unison and ignore */.git it will just keep the work-trees syncd
19:08 prooftechnique joined #git
19:09 prooftechnique left #git
19:11 lvns joined #git
19:11 btree joined #git
19:12 btree left #git
19:13 cdg joined #git
19:13 gws Is there anything special about the word  'MAIN'?
19:14 bremner in what context?
19:14 gws branches, tags, things
19:14 bremner no
19:14 gws I'm having a problem where I can't rebase in a repo cloned from one called MAIN
19:15 moritz what errors do you get?
19:15 mohabaks joined #git
19:16 gws here's the rebase output after a quick test of creating a file in each of two branches and then trying to rebase one onto the other
19:16 gws First, rewinding head to replay your work on top of it...
19:16 gws Applying: something
19:16 gws fatal: MAIN: not a valid old SHA1
19:17 gws MAIN isn't even the name of the remote
19:17 gws just the name of the folder where the parent repo lives
19:17 ojacobson !transcript
19:17 gitinfo Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
19:17 moritz gws: then git knows nothing about it
19:17 moritz gws: git remote -v
19:17 moritz this will tell you the name of the remote
19:18 gws it's 'origin'
19:18 moritz so, git rebase origin/master # or something like that
19:18 gws I want to rebase a local branch onto a local branch, I don't even need the parent for this
19:19 gws btw, git remote -v shows two versions of 'origin', one (fetch) and one (push), is that correct?
19:20 moritz yes
19:20 moritz gws: then why are you typing anything related to MAIN at all in your rebase commands?
19:20 gws I'm not, that's what's so confusing
19:20 moritz gws: then !transcript please
19:20 gitinfo gws: Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
19:20 gws I'll start over and get you a full session
19:22 Grimm_ joined #git
19:24 gws oops...brb. Forgot to start screen on the way in
19:24 gws_ joined #git
19:26 emx joined #git
19:27 Balliad joined #git
19:30 boudiccas joined #git
19:31 bollullera joined #git
19:34 jaguarmagenta joined #git
19:35 alex1a joined #git
19:36 kenansulayman joined #git
19:37 Rodya_ joined #git
19:37 circ-user-0DHXl joined #git
19:38 Infamous joined #git
19:41 Arsonide joined #git
19:41 nnyk_ joined #git
19:45 drodger joined #git
19:48 robcollier joined #git
19:53 diegoviola joined #git
19:54 astrofog joined #git
19:55 rgrinberg joined #git
19:56 drodger joined #git
19:58 gws_ well, I can't reproduce the problem. https://gist.github.com/geofrey/​1e0af964afdac0bdf0a2b0103caaadca
19:58 ItSANgo joined #git
19:58 nnyk joined #git
19:58 gws_ I guess I'll try it again and grab the output if things go wrong again
19:59 EvilPeng1 joined #git
20:00 tvon joined #git
20:01 mikecmpbll joined #git
20:02 jstimm joined #git
20:02 troulouliou_dev joined #git
20:02 hobodave_ joined #git
20:04 brandonw joined #git
20:04 italoacasas joined #git
20:05 Grimm_ joined #git
20:05 fracting joined #git
20:06 interne7y joined #git
20:09 IWishIKnew joined #git
20:09 MrWoohoo joined #git
20:10 edude03 joined #git
20:11 mizu_no_oto joined #git
20:12 italoacasas joined #git
20:12 drodger joined #git
20:15 chachasmooth joined #git
20:17 bango2 joined #git
20:17 fscala joined #git
20:18 koro if i have cloned a github repo from someone locally, and I want to fork their project to submit a pull request, is there a way I can sync my local copy with the fork in github ?
20:18 koro (the instructions from there say that I should first fork, then clone, then make the fixes and submit a pull request, but I have already cloned and fixed, now I want to submit)
20:19 Orion3k joined #git
20:19 romerocesar joined #git
20:20 perlpilot koro: just add another remote to that repo for your fork
20:20 koro I still haven't created a fork
20:20 koro so what you suggest is i do a fork, then add it as a remote for my local version?
20:22 chachasmooth joined #git
20:25 nnyk_ joined #git
20:29 johnmilton joined #git
20:29 watabou joined #git
20:33 gws_ Okay, got the same problem as before. I can't rebase a local branch onto a local branch in my cloned repo. Details updated at https://gist.github.com/geofrey/​1e0af964afdac0bdf0a2b0103caaadca
20:34 gws_ the CMD script is there in case I'm cloning incorrectly somehow, but I've been using the same script for a while without prior problems
20:35 d4rklit3 joined #git
20:35 gws_ error message at rebase-clone.txt:39
20:38 Rodya_ joined #git
20:38 Infamous- joined #git
20:39 sentriz joined #git
20:40 kenansulayman joined #git
20:40 ojdo joined #git
20:44 shinnya joined #git
20:44 italoacasas joined #git
20:44 espindola joined #git
20:45 Literphor joined #git
20:47 jrnieder joined #git
20:47 jrnieder left #git
20:48 jrnieder joined #git
20:49 johnmilton joined #git
20:50 Literphor joined #git
20:50 italoacasas joined #git
20:50 romerocesar joined #git
20:51 Winter_ joined #git
20:54 chachasmooth joined #git
20:57 semantipc joined #git
20:58 aard_ joined #git
20:58 d4rklit3 joined #git
21:01 Infamous joined #git
21:01 italoacasas joined #git
21:02 jaime joined #git
21:02 MacWinner any pointers to videos that explain github concepts?  something not so focused on the CLI, but more the terminology
21:02 erebel55 left #git
21:02 kenansul- joined #git
21:04 perlpilot MacWinner: if you mean "git concepts", there's several videos out there.  I like "Git for ages 4 and up"
21:04 m0viefreak joined #git
21:05 MacWinner thanks!
21:05 perlpilot MacWinner: if you really do mean "github concepts", then you'd have to check github.com
21:05 perlpilot or maybe #github
21:05 MacWinner oops.. sorry, meant git
21:06 semantip_ joined #git
21:07 ecksit joined #git
21:08 gws_ I can't rebase a local branch - git says "fatal: MAIN: not a valid old SHA1" but MAIN isn't a branch or a tag or even a remote, it's just the directory I cloned from. What does this mean? I'm at wits' end.  : (
21:08 kwaku joined #git
21:08 selckin what cmd did you run
21:09 jeffreylevesque joined #git
21:09 gws_ "git rebase foo"
21:09 bollullera joined #git
21:09 gws_ after creating a new file on foo and creating a new file on bar
21:09 ojacobson Can you run `git rebase -i foo` and add the rebase list from the resulting editor window to that gist?
21:09 ncthom91 joined #git
21:10 gws_ yes, one moment
21:10 ahmedelgabri joined #git
21:10 romerocesar joined #git
21:10 bollullera left #git
21:11 bollullera joined #git
21:11 gws_ btw the rebase seems to succeed WRT the code merging; after that failure the index is ready to commit (and committing works without incident)
21:13 Rodya_ joined #git
21:16 italoacasas joined #git
21:16 nwkj86 joined #git
21:18 gws_ ojacobson: it worked. Why did it work with --interactive and not before? -what is this sorcery-
21:18 gws_ (gist updated)
21:18 dsdeiz joined #git
21:19 k3rn31 joined #git
21:19 ojacobson dang.
21:19 mellernoia joined #git
21:19 ojacobson I was hoping the hash in that list would be bogus
21:19 ojacobson no such luck
21:20 drodger joined #git
21:21 gws_ Is there anything to indicate whether the source repo is broken, or if the clone was done wrong..?
21:22 gws_ And what would it mean if the commit list for the rebase was impossible?
21:24 diogenese joined #git
21:24 kenansul- joined #git
21:24 Infamous joined #git
21:30 bruce_lee joined #git
21:30 bruce_lee joined #git
21:32 thiago joined #git
21:35 jaguarmagenta joined #git
21:37 boombatower joined #git
21:37 mekhami joined #git
21:39 hobodave joined #git
21:39 BettePjews joined #git
21:41 youser joined #git
21:42 EvilPenguin joined #git
21:42 joki joined #git
21:45 cosmicfires joined #git
21:46 cosmicfires If I revert a commit I'll replace my current files with the commit, correct?
21:47 osse no
21:47 osse !revert
21:47 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]?
21:49 cosmicfires how do I replace my working with a previous commit?
21:49 converge joined #git
21:50 kulelu88 joined #git
21:50 dhollinger joined #git
21:51 osse depends on why you want to do it
21:51 jstimm joined #git
21:51 benwbooth joined #git
21:51 converge I love git, but its so hard to work with
21:52 cosmicfires I tried to fix a problem and found out I didn't understand the problem, I want to put my source back to the way it was before my misguided fix
21:52 converge every step is a nightmare, there is always something to fix
21:52 osse cosmicfires: do you want to forget the commit(s) you made yourself?
21:52 benwbooth joined #git
21:53 italoacasas joined #git
21:53 cosmicfires I made a commit of the current state just in case so no I don't want to forget it completely
21:54 Shentino joined #git
21:54 osse cosmicfires: then I think you want to create a branch or tag here, e.g. ''git branch my-misguided-fix''. then reset the current branch to the commit you want to go back to:  ''git reset --hard abc123''
21:54 osse at least that's what i would do
21:56 cosmicfires thank you
21:56 cosmicfires I find git very valuable but I don't know too much about using it yet
21:56 vishal !xkcd
21:56 vishal that should totally be a trigger ;)
21:57 vishal https://xkcd.com/1597/
21:57 vishal :)
21:59 mikecmpbll joined #git
22:00 Literphor joined #git
22:03 d5sx43 joined #git
22:03 eletuchy joined #git
22:03 lvns joined #git
22:04 dstarh joined #git
22:05 Meow-J joined #git
22:06 cosmicfires thanks for the help osse
22:07 m_antis joined #git
22:08 interne7y joined #git
22:08 MacWinner are pull requests a github concept or a standard git concept?
22:08 rgrinberg joined #git
22:10 nilsi joined #git
22:10 osse MacWinner: a bit of both
22:10 mikecmpbll joined #git
22:10 osse MacWinner: pull is a git concept. a request for someone to pull from you is a human concept.  github puts it into a neat webn interface
22:11 MacWinner what about the various permission models?
22:11 MacWinner like the ability to give certain people privileges.. are those stored in git? or is that the model that github enforces around git?
22:11 osse definitely github
22:11 osse git itself doesn't care.
22:11 osse by which I mean it doesn't know
22:12 MacWinner does git itself have any sort of ACLs?
22:12 osse it's all up to the hosting solution
22:13 knutstrut joined #git
22:13 hekto joined #git
22:14 asimzaidi left #git
22:14 MacWinner got it.. thank you!
22:15 sangy joined #git
22:16 benwbooth joined #git
22:16 ctcrnitv joined #git
22:16 Xzn joined #git
22:19 ctcrnitv test
22:19 ctcrnitv I have some stupid git bug where if I try to stage a file with git add -p it just says "No changes"
22:20 osse are you sure it has changes?
22:21 romerocesar joined #git
22:21 ctcrnitv there are definitely changes from the last commit
22:22 neanderslob joined #git
22:22 Nunm joined #git
22:23 osse what does ''git diff -- thatfile'' say ?
22:23 allcentury joined #git
22:23 cworth joined #git
22:25 PasiFist joined #git
22:25 ctcrnitv it doesn't output anything
22:26 osse then there definitely not changes
22:26 interne7y joined #git
22:27 osse or any changes have already been added
22:28 ctcrnitv I only have an initial commit which was empty files, I definitely made changes, maybe I added them already
22:28 osse run git status
22:28 osse often
22:28 ctcrnitv but shouldn't unstaging the files remove the changes?
22:28 osse all the time
22:28 GavinMagnus joined #git
22:28 ctcrnitv yeah I ran git status
22:28 osse sure, but have you done that?
22:28 ctcrnitv i did
22:28 ctcrnitv when I unstage them and do git add -p, same thing "no changes"
22:29 osse does git status say they aren't staged?
22:29 ctcrnitv I can do that in a second...hold on.
22:31 ochorocho__ joined #git
22:31 tanuki joined #git
22:32 madewokherd joined #git
22:33 ctcrnitv now I'm getting : fatal: ambiguous argument 'HEAD^
22:33 ctcrnitv I think I'm just going to start using a GUI, sick of this
22:34 ctcrnitv thanks for trying to help though
22:35 osse HEAD^ is wrong if you only have one commit
22:35 osse *read* git status. do what it tells you to do.
22:36 tref joined #git
22:36 ctcrnitv (use "git reset HEAD <file>..." to unstage
22:37 ctcrnitv when I do git reset HEAD <file> it doesn't seem to make any difference to anything
22:37 ctcrnitv and that's without the carat which is the first thing I tried
22:38 ctcrnitv I did "git reset HEAD . "
22:38 osse does git status still list the files as staged?
22:38 fission6 joined #git
22:39 ctcrnitv it says they're untracked
22:39 osse sounds good to me
22:39 osse they're not staged at least
22:39 ctcrnitv git add -p still says "no changes"
22:40 hekto joined #git
22:40 xanadu_ joined #git
22:40 ctcrnitv I've been using git for months now and honestly it's the most frustrating part of programming for me
22:40 ctcrnitv done with this, as I said I'm going to just use a gui
22:40 ctcrnitv thanks for trying to help me out
22:41 osse if the file is untrack my guess is git add -p won't do much
22:41 osse the whole file is the change
22:41 SwiftMatt joined #git
22:42 GavinMagnus joined #git
22:42 ctcrnitv I get what you're saying. I think it's just me getting confused by staging, unstaging, adding, resetting, untracking, tracking, diffing, etc
22:43 ctcrnitv I just don't know what to do to get it back to the state where I have the changes ready to commit, so that I could just add the lines I want to
22:43 osse i've yet to see a GUI that actually makes all that easier to understand
22:43 osse easier to present maybe.
22:43 ctcrnitv well if it presents it to me in a visual way, I could maybe understand what's going on
22:44 osse what goes on is that it's a completely new file that git doesn't know about
22:44 osse so there is nothing to compare it to
22:45 ctcrnitv oh, ok I kind of get that.
22:45 ctcrnitv that makes sense
22:45 osse ctcrnitv: try  ''git add -n file(s)''  and then try git add -p
22:46 ctcrnitv ok I tried that, it says "add ...(files)"
22:46 ctcrnitv git status shows them as still untracked
22:46 ctcrnitv git add -p says No changes
22:46 osse shit
22:46 osse I meant git add -N
22:47 ctcrnitv got it! wow I wish I had known about git add -N
22:48 osse git add -N basically makes git pretend the file is empty when adding it
22:48 ctcrnitv I've run into this problem a few times before and no one knows what I'm talking about
22:48 osse and then it has something to compare it to
22:48 osse sort of
22:48 ctcrnitv thanks so much, I will be using that a lot
22:49 osse but after that add -p will just show you the whole contents as one big hunk, no?
22:50 PasiFist joined #git
22:50 ctcrnitv yeah, ok that's the problem I was having earlier before this most recent issue
22:50 ctcrnitv shouldn't "e" allow me to edit the hunk?
22:50 ctcrnitv split it up, etc?
22:50 osse yes
22:51 ctcrnitv it just loops back to the same question though
22:51 romerocesar joined #git
22:52 ctcrnitv Stage this hunk?  e...Stage this hunk?..I said "e"....Stage this hunk?
22:52 osse it didn't open an editor?
22:53 ctcrnitv nope.
22:53 osse echo $GIT_EDITOR
22:53 osse ''git config core.editor''
22:53 ctcrnitv oh yeah. I deleted atom that's why
22:54 osse good boy
22:54 osse just kidding. I haven't tried it
22:55 Balliad joined #git
22:55 EduardoMartins joined #git
22:55 GavinMagnus joined #git
22:57 Balliad joined #git
22:59 nexr joined #git
22:59 TurBoss joined #git
22:59 TurBoss Hi
22:59 gitinfo TurBoss: 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.
22:59 diegoaguilar joined #git
23:00 TurBoss I have cloned a repo and inmediatly removes some files and show them in unstaged state
23:00 TurBoss how I can reset the repo?
23:00 GavinMagnus joined #git
23:00 TurBoss this never happende before
23:01 TurBoss i'm on windows 10 and using gitkraken as clien
23:01 TurBoss maybe a clients bug?
23:01 TurBoss they are php files
23:01 Infamous joined #git
23:03 kenansulayman joined #git
23:04 arescorpio joined #git
23:09 mostlybadfly joined #git
23:10 kappy joined #git
23:10 MattMaker joined #git
23:12 chris3492 joined #git
23:13 chris3492 What does git -H do? I get the error: Unknown option: -H
23:14 tomreyn then it probably does nothing ;)
23:14 tomreyn ... in the version you have there
23:14 Infamous joined #git
23:14 kenansul- joined #git
23:16 chris3492 How can I know what it does.. if its safe to exclude -H?
23:17 tomreyn the output you got there would suggest it's not a defined / available option. if you want to be *really* sure i guess you need to study the source code.
23:17 tomreyn what makes you think it does do anything?
23:17 chris3492 Because docmentionat for something else says: run git -H ....
23:19 tomreyn does it maybe say that with "sudo" in front?
23:19 uld joined #git
23:19 Eugene !xy !blog
23:19 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
23:19 gitinfo Blog or Answer posts(like StackOverflow), while helpful and informative, are quite often outdated, give bad advice, or are just plain wrong. Please don't rely solely upon them, or treat them as authoritative. We recommend reading the documentation and consulting multiple sources, such as the expert advice to be found on IRC
23:20 chris3492 sudo -u git -H git fetch --all
23:20 Eugene There it is!
23:20 tomreyn yeay, i'm good at guessing
23:20 Eugene -H is an argument to sudo, not to git
23:20 Eugene This is why there's no -H in man git
23:20 gitinfo the git manpage is available at http://jk.gs/git.html
23:23 robbyoconnor joined #git
23:23 tomreyn what i never got about git... does "git - the stupid content tracker" mean to suggest that the tracker or the content is stupid?
23:23 * tomreyn giggle
23:23 Eugene It's a play on words. git is British slang for "stupid man"; Linus says this is self-descriptive of himself; the way git's object model is "stupid"
23:24 Eugene (stupid simple, and obvious once you git it, har har)
23:26 diogenese joined #git
23:26 mikecmpbll joined #git
23:29 ctcrnitv thanks osse, I was able to chop up the hunks and get on with my day ;)
23:29 EduardoMartins1 joined #git
23:30 justanotheruser joined #git
23:30 ctcrnitv switching to a gui was probably an overreaction I'll stay old school for now
23:30 gavin joined #git
23:33 e3 joined #git
23:33 mattfoo joined #git
23:34 e3 Hello, I am using gitk to display the commit tree. Right now, I fetched a lot of new commits. Some of the new commits are displayed above my local master and some of them are displayed blow my local master. How can I move all new commits above my local master? I would like to inspect all of them before I make a merge.
23:36 jaguarmagenta joined #git
23:38 GavinMagnus left #git
23:39 TurBoss left #git
23:40 anirudhj joined #git
23:40 TurBoss joined #git
23:40 TurBoss I can't unstage some files
23:41 TurBoss I didn't modidied nothing...
23:41 thiago TurBoss: using git reset?
23:41 TurBoss sek
23:41 TurBoss using unstage from git-extetnsions
23:42 thiago do what git status suggests
23:43 Udken joined #git
23:43 TurBoss thiago: http://dpaste.com/0SX1T2N
23:44 thiago TurBoss: you're done
23:44 bollullera left #git
23:44 TurBoss git reset doesn't reset
23:45 TurBoss :D
23:45 thiago it does reset
23:45 thiago git status shows you're in a reset state
23:45 thiago there's nothing left to do
23:45 TurBoss and why there are 3 files?
23:45 TurBoss i want to unstage them
23:45 thiago they are unstaged
23:45 TurBoss ahhh
23:46 thiago "Changes not staged for commit:"
23:46 TurBoss okok
23:46 thiago *not* staged
23:46 TurBoss sry
23:46 TurBoss and how i can remove them?¿
23:46 TurBoss i mean restet to the latest commit?
23:47 thiago (use "git checkout -- <file>..." to discard changes in working directory)
23:48 TurBoss trying..
23:48 TurBoss doesn't work
23:48 TurBoss :(
23:49 TurBoss thiago: http://dpaste.com/28X948F
23:49 thiago are you on Windows?
23:49 TurBoss ye
23:49 TurBoss windows 10
23:50 TurBoss cygwin
23:50 TurBoss for bash
23:50 thiago then it's probably the line ending
23:50 TurBoss http://dpaste.com/28X948F
23:50 mablae_ joined #git
23:50 TurBoss oops
23:50 TurBoss no
23:51 thiago the files probably have CRLF in them
23:51 TurBoss ah
23:52 thiago since git wants to convert from CRLF to LF when committing again, the file is marked as changed
23:52 thiago checking out again won't help because CRLFs want to be converte to LF
23:52 TurBoss i'll check options
23:53 TurBoss of the git extensions
23:54 KnightsOfNi joined #git
23:56 thiago converting CRLF is the default on Windows
23:57 TurBoss ok will investigate thx!
23:58 Literphor joined #git
23:59 cdg joined #git

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