Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-19

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

All times shown according to UTC.

Time Nick Message
00:00 WhiskerBiscuit joined #git
00:01 inflames joined #git
00:03 buffal0 joined #git
00:03 tobiasBora joined #git
00:04 dsdeiz joined #git
00:06 WhiskerBiscuit joined #git
00:07 rangergord joined #git
00:09 mario_ joined #git
00:09 venmx joined #git
00:10 howitdo joined #git
00:12 jaguarmagenta joined #git
00:17 mischat joined #git
00:21 diogenese joined #git
00:22 Goplat joined #git
00:22 arescorpio joined #git
00:26 buffal0 joined #git
00:28 cagedwisdom joined #git
00:31 Gsham joined #git
00:32 Shentino joined #git
00:32 hahuang61 joined #git
00:32 romerocesar_ joined #git
00:33 invisbl joined #git
00:34 netj joined #git
00:34 Vampire0_ joined #git
00:35 bronson joined #git
00:37 buffal0 joined #git
00:43 romerocesar joined #git
00:43 particleGolem joined #git
00:47 WhiskerBiscuit joined #git
00:50 tobiasBora joined #git
00:51 Sample joined #git
00:52 jaguarmagenta joined #git
00:53 gentoo joined #git
00:53 Darren_ joined #git
00:55 cdown joined #git
01:00 netj joined #git
01:03 _28_ria joined #git
01:05 _28_ria joined #git
01:09 dodobrain joined #git
01:10 buffal0 joined #git
01:10 romerocesar joined #git
01:13 cdown joined #git
01:13 venmx joined #git
01:15 rchavik joined #git
01:18 mischat joined #git
01:18 realz joined #git
01:19 Noodlewitt joined #git
01:20 romerocesar joined #git
01:23 tobiasBora joined #git
01:24 menip joined #git
01:24 FederationOfNULL joined #git
01:28 BenderRodriguez joined #git
01:29 whitby joined #git
01:30 Gsham joined #git
01:33 hahuang61 joined #git
01:33 BenderRodriguez joined #git
01:34 shgysk8zer0 joined #git
01:34 cdown joined #git
01:38 oskarkv joined #git
01:43 ShapeShifter499 joined #git
01:43 boombatower joined #git
01:44 JJMcPhearson joined #git
01:50 rangergord joined #git
01:54 invisbl joined #git
01:54 Poppa joined #git
01:57 cdg joined #git
02:00 somaReve1 joined #git
02:01 somaReve1 hi, how can I git pull <remote branch> <local branch> ?
02:03 preaction somaReve1: git pull <remote> <remote branch>:<local branch>
02:03 LordRyan somaReve1: git checkout local-branch; git fetch origin; git merge origin/remote-branch
02:04 LordRyan or if ^^ works that's fine too i guess
02:06 cqi joined #git
02:09 gentoo joined #git
02:09 gentoo joined #git
02:10 d^sh joined #git
02:10 gentoo joined #git
02:10 gentoo joined #git
02:11 gentoo joined #git
02:13 Gsham joined #git
02:14 _28_ria joined #git
02:15 venmx joined #git
02:19 mischat joined #git
02:23 sonOfRa Can I somehow set the "pager" that is used for git add -p, via some setting like core.pager?
02:23 sonOfRa My core pager is diff-so-fancy, and I'd like the fancy output also when staging things
02:23 Vampire0 joined #git
02:26 sonOfRa Answered my own question, but for completeness' sake: interactive.diffFilter is the setting I was looking for
02:27 madewokherd joined #git
02:30 Siegfried joined #git
02:31 tmsmith joined #git
02:31 gentoo_ joined #git
02:32 Gsham joined #git
02:34 buffal0 joined #git
02:36 bronson joined #git
02:39 paraparity joined #git
02:41 pks joined #git
02:41 enckse joined #git
02:46 storrgie joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:53 safe joined #git
02:54 dodobrain joined #git
02:55 gentoo_ joined #git
02:57 rangergord left #git
02:59 Shakeel__ joined #git
02:59 somaReve1 preaction: hmm, i did 'git pull origin master:master'. It also merged to my current branch.
03:00 bruce_lee joined #git
03:00 xall joined #git
03:00 preaction okay, well, the docs on my version say that works
03:00 krillr_ joined #git
03:01 hussam joined #git
03:01 rafalcpp_ joined #git
03:03 CussBot_ joined #git
03:03 ochorocho__ joined #git
03:04 samwise[m]1 joined #git
03:04 salamanderrake joined #git
03:04 moop_ joined #git
03:05 storrgie_ joined #git
03:06 JrCs joined #git
03:06 M64137[m] joined #git
03:06 dpower joined #git
03:07 shauna joined #git
03:07 codebam joined #git
03:07 Klumben joined #git
03:07 Potatoes joined #git
03:07 Bigcheese_ joined #git
03:07 Peng_ joined #git
03:08 cyphase joined #git
03:08 JelmerD joined #git
03:09 aavrug joined #git
03:09 rchavik joined #git
03:09 texasmynsted joined #git
03:09 quizzi joined #git
03:10 Xarodon joined #git
03:10 afuentes joined #git
03:11 tmsmith joined #git
03:11 nilsi joined #git
03:12 ws2k3 joined #git
03:12 Afforess joined #git
03:12 ixian joined #git
03:13 Noodlewitt joined #git
03:13 nixdork joined #git
03:14 invisbl joined #git
03:15 netj joined #git
03:16 chachasmooth joined #git
03:16 venmx joined #git
03:16 mostlybadfly joined #git
03:17 axisys joined #git
03:18 lolmac_ joined #git
03:19 BlessJah joined #git
03:19 aw1 joined #git
03:19 mtso[m] joined #git
03:20 mischat joined #git
03:21 VladGh_ joined #git
03:23 ulkesh_ joined #git
03:23 mei[m]1 joined #git
03:24 jaafar joined #git
03:24 tabakhase joined #git
03:25 fcrick joined #git
03:28 QualityAddict joined #git
03:29 compeman joined #git
03:29 mrnuke joined #git
03:29 Gsham joined #git
03:31 JuliusN joined #git
03:31 invisbl joined #git
03:32 CtrlC joined #git
03:33 eycsigfy joined #git
03:33 buffal0 joined #git
03:36 kyan joined #git
03:38 fahadash joined #git
03:38 ResidentBiscuit joined #git
03:41 QuestionTime joined #git
03:41 xall joined #git
03:42 dodobrain joined #git
03:45 cdg joined #git
03:46 hexagoxel joined #git
03:47 Gobbert joined #git
03:48 HanClinto joined #git
03:50 test joined #git
03:50 howdoi joined #git
03:51 QuestionTime joined #git
03:54 LiMp^ joined #git
03:55 a_thakur joined #git
03:56 dreiss joined #git
04:02 sunri5e joined #git
04:03 anonymus_ joined #git
04:04 fstd joined #git
04:05 toothe joined #git
04:06 toothe I have a master branch and a branch called 'policy'. There were some changes merged to master.
04:06 toothe I have some changes in the 'policy' branch, that I would like to grab the updates in master. How do I merge them in?
04:06 toothe in other words, master and policy have gone in two different directions, and I would liek to copy over the changes from master into policy.
04:06 toothe (they are not on the same files)
04:07 kadoban toothe: merge master into policy? Or rebase policy on master, depending on if history of policy has been published and depending on what you want history to look like.
04:07 Limes joined #git
04:08 toothe I think its called rebasing?
04:08 toothe so, master had changes to a file called 'core/variables.py', and policy doesn't have that file. I would like to get that, along with any other changes.
04:10 kadoban Answer unchanged so far
04:10 toothe https://dpaste.de/q1dw
04:10 romerocesar_ joined #git
04:11 toothe I do not fully understand how to resolve this. I get that its saying "You need to do something to this file to resolve the problem"
04:11 toothe but, I don't get how.
04:13 Lyqyd joined #git
04:13 jaguarmagenta joined #git
04:14 toothe kadoban: assistance please?
04:14 Vortex35 joined #git
04:15 toothe nist/migrations/0001_initial.py: needs merge
04:15 toothe what does that mean?
04:16 toothe wait, I think I got it. git rm
04:17 venmx joined #git
04:21 toothe okay, I screwed up my git repo
04:21 toothe I need assistance???
04:21 romerocesar joined #git
04:21 mischat joined #git
04:21 toothe https://dpaste.de/ngii
04:21 toothe I don't get what's wrong?
04:22 SwiftMatt joined #git
04:22 FSadino joined #git
04:23 toothe I have no idea wha tjust happened.
04:23 toothe assistance?
04:23 toothe error: you need to resolve your current index first
04:24 toothe what does that mean?
04:25 diogenese joined #git
04:25 toothe I just did a rebase from a master, but now I can't seem to push either the master or the branch.
04:25 Gsham joined #git
04:25 FSadino joined #git
04:27 breezy_ joined #git
04:27 toothe wait...fixed it.
04:27 toothe that was confusing.
04:28 robotroll joined #git
04:28 FSadino joined #git
04:29 FSadino What I can do when git doesn't detect changes on working dir?
04:31 FSadino What I have to do when git doesn't detect changed files on working dir?
04:32 FSadino I changed some files on my working dir, the I do "git add *, but when I do " git status" it doesn't show any files to pull
04:32 toothe try git add -A .
04:33 cdg_ joined #git
04:33 FSadino toothe: thanks in advance
04:33 FSadino Why -A?
04:35 subhojit777 joined #git
04:35 toothe All.
04:35 toothe man git-add, the -A means 'All'.
04:35 gitinfo the git-add manpage is available at http://jk.gs/git-add.html
04:35 FSadino Thanks again
04:36 dsdeiz joined #git
04:36 hahuang61 joined #git
04:37 bronson joined #git
04:37 QuestionTime joined #git
04:41 toothe FSadino: did it work?
04:42 FSadino I can't test it because I'm on my job. Thanks for the manual
04:42 FSadino I will report later
04:43 sbulage joined #git
04:45 fstd joined #git
04:46 AfroThundr joined #git
04:48 FSadino toothe: its strange because I have done always with "git add *" but now it doesn't work... Already cleaned reinitializated git repo but no efect
04:51 dreiss joined #git
04:54 jaguarmagenta joined #git
04:59 SwiftMatt joined #git
05:01 FSadino joined #git
05:03 elmcrest joined #git
05:04 ochorocho__ joined #git
05:08 cspotcode joined #git
05:08 dreiss joined #git
05:10 zeller joined #git
05:16 Sample joined #git
05:18 venmx joined #git
05:20 aidalgol joined #git
05:22 mischat joined #git
05:22 dreiss joined #git
05:30 OwlN joined #git
05:31 prg3 joined #git
05:31 llamapixel I hve never used * but . so therefore git add .
05:33 hahuang61 joined #git
05:33 OwlN left #git
05:34 bocaneri joined #git
05:35 howitdo joined #git
05:36 invisbl joined #git
05:41 donught joined #git
05:41 invisbl joined #git
05:43 Cabanossi joined #git
05:49 netj joined #git
05:54 kazantip joined #git
05:57 freimatz joined #git
05:57 ismithers joined #git
06:00 tarkus joined #git
06:03 gtristan joined #git
06:03 jaguarmagenta joined #git
06:05 ochorocho__ joined #git
06:06 dreiss joined #git
06:07 rscata joined #git
06:07 z8z joined #git
06:07 ayogi joined #git
06:11 lordjancso joined #git
06:12 Khisanth joined #git
06:16 Nilesh_ joined #git
06:17 ToBeCloud joined #git
06:18 venmx joined #git
06:19 overlord_tm joined #git
06:20 cqi joined #git
06:23 mischat joined #git
06:24 dreiss joined #git
06:26 Raging_Hog joined #git
06:27 jfr joined #git
06:30 lightstalker joined #git
06:32 tarkus joined #git
06:32 dan2k3k4 joined #git
06:36 breezy_ joined #git
06:37 OOPMan joined #git
06:38 bronson joined #git
06:43 gtristan joined #git
06:44 Macaveli joined #git
06:45 Ovex joined #git
06:47 tarkus joined #git
06:50 qt-x joined #git
06:52 dreiss joined #git
06:52 donught joined #git
06:58 ThomasLocke joined #git
06:58 ThomasLocke joined #git
06:58 kyan joined #git
06:58 darkbit joined #git
07:00 venmx joined #git
07:00 dermoth joined #git
07:07 freimatz joined #git
07:09 cyan__ joined #git
07:09 vdv joined #git
07:15 cdg joined #git
07:15 xall joined #git
07:15 cdg joined #git
07:17 rorro joined #git
07:19 [Saint] joined #git
07:20 JeroenT joined #git
07:21 ogny joined #git
07:25 zeroed joined #git
07:25 mischat joined #git
07:30 nidr0x joined #git
07:30 jnavila joined #git
07:35 Endarked joined #git
07:36 Mogget joined #git
07:37 xall joined #git
07:38 pks joined #git
07:38 zeroed joined #git
07:38 zeroed joined #git
07:46 Sceorem joined #git
07:51 dreiss joined #git
07:54 aoilotr joined #git
07:55 aoilotr Hello I have a question, I have to take the train and I will be offline for some hours, if I do my commits on my computer (like git add ./git commit -m "message") when I'll come back to my house will I be able to push all the commits at the same time ?
07:58 invisbl joined #git
07:59 osse aoilotr: yes
08:00 ogny joined #git
08:01 venmx joined #git
08:03 NimeshNeema joined #git
08:05 Derderderd joined #git
08:05 elect joined #git
08:05 Maktm joined #git
08:05 theoceaniscool joined #git
08:05 Maktm i don't understand the reasoning for this answer -- https://softwareengineering.stackexchange​.com/questions/69178/what-is-the-benefit-​of-gits-two-stage-commit-process-staging
08:05 Jackneill joined #git
08:06 Maktm why can't you do the same thing with other VCSs?
08:06 Maktm i.e. fix it all at once and commit
08:06 ochorocho__ joined #git
08:07 _ikke_ Because they don't care enough about clean commits?
08:08 _ikke_ Because they think the process is too complicated?
08:08 _ikke_ Who knows
08:09 llamapixel Are all VCS really distrubted like GIT? no
08:09 Atm0spher1c joined #git
08:11 iron_houzi kadoban: Sorry for popping the question and ghosting you. Thanks for the help yesterday.
08:14 uu joined #git
08:15 diogenese joined #git
08:15 zeroed joined #git
08:15 zeroed joined #git
08:17 hahuang61 joined #git
08:20 jknetl joined #git
08:20 utanapischti joined #git
08:22 BadSnappa joined #git
08:26 mischat joined #git
08:27 mischat joined #git
08:27 derk0pf joined #git
08:27 a_thakur joined #git
08:28 Singmyr joined #git
08:29 finalbeta joined #git
08:33 sea-gull joined #git
08:38 zeroed joined #git
08:38 zeroed joined #git
08:39 bronson joined #git
08:41 inflames joined #git
08:42 syg_ joined #git
08:44 PCatinean joined #git
08:44 Balliad joined #git
08:45 danslo joined #git
08:45 Gloomy joined #git
08:49 kedare joined #git
08:49 kedare joined #git
08:51 parasite_ joined #git
08:51 hhee joined #git
08:52 djb-irc joined #git
08:53 roxlu joined #git
08:53 cyphase joined #git
08:53 Sample joined #git
08:53 Singmyr joined #git
08:54 ogny joined #git
08:57 willlondon joined #git
08:58 encod3 joined #git
08:59 marcogmonteiro joined #git
09:02 venmx joined #git
09:02 cdg joined #git
09:02 GavinMagnus joined #git
09:02 chele joined #git
09:05 _ng joined #git
09:06 mikecmpbll joined #git
09:07 GavinMagnus left #git
09:08 ochorocho__ joined #git
09:11 kurkale6ka joined #git
09:11 zeroed joined #git
09:11 zeroed joined #git
09:15 subhojit777 joined #git
09:20 nilg joined #git
09:22 a_thakur joined #git
09:23 a_thakur joined #git
09:24 spb joined #git
09:26 overlord_tm joined #git
09:27 spb joined #git
09:28 Sample joined #git
09:28 mischat joined #git
09:30 a_thakur_ joined #git
09:32 clmsy joined #git
09:33 a_thakur joined #git
09:35 troulouliou_div2 joined #git
09:36 ochorocho__ joined #git
09:42 mischat joined #git
09:42 star_prone joined #git
09:43 finalbeta joined #git
09:44 nettoweb joined #git
09:45 dan2k3k4 joined #git
09:48 rahtgaz joined #git
09:49 ochorocho__ joined #git
09:53 cdown joined #git
09:53 onmeac joined #git
09:58 thief joined #git
10:00 hahuang61 joined #git
10:02 ferr1 joined #git
10:02 venmx joined #git
10:03 lohfu joined #git
10:06 QwertyDragon joined #git
10:09 greeny___ joined #git
10:11 howitdo joined #git
10:12 a_thakur joined #git
10:13 Serpent7776 joined #git
10:14 rnsanchez joined #git
10:15 nanga joined #git
10:17 aw1 joined #git
10:18 invisbl joined #git
10:21 CheckDavid joined #git
10:21 realtime joined #git
10:22 Caelum I was correcting an #include statement, and wanted to put both the erroneous and correct version in the commit message, but forgot that # starts a comment...
10:22 Caelum and I already pushed it
10:22 Caelum god dammit
10:22 achadwick joined #git
10:26 bouncy joined #git
10:29 clmsy joined #git
10:30 a_thakur joined #git
10:32 danslo joined #git
10:33 inflames joined #git
10:33 syg_ joined #git
10:35 danslo joined #git
10:38 timothy joined #git
10:40 bronson joined #git
10:42 sylario joined #git
10:42 YuGiOhJCJ joined #git
10:44 _jan joined #git
10:50 raspado joined #git
10:59 cdown joined #git
11:01 mikecmpb_ joined #git
11:01 rorro joined #git
11:02 jaguarmagenta joined #git
11:03 venmx joined #git
11:04 mahendratech joined #git
11:05 Gloomy joined #git
11:05 metachr0n joined #git
11:05 rominronin joined #git
11:06 cdown_ joined #git
11:07 buffal0 joined #git
11:08 SwiftMatt joined #git
11:09 los joined #git
11:09 hahuang61 joined #git
11:10 joki- joined #git
11:11 re1 joined #git
11:12 buffffal00 joined #git
11:12 bdeferme joined #git
11:12 derk0pf joined #git
11:13 JeroenT joined #git
11:16 Endarked joined #git
11:16 willlondon joined #git
11:18 afuentes joined #git
11:18 _Vi joined #git
11:20 aw1 joined #git
11:22 byte512 joined #git
11:23 invisbl joined #git
11:24 thesha joined #git
11:25 King_Hual joined #git
11:25 King_Hual joined #git
11:28 buffal0 joined #git
11:31 invisbl joined #git
11:31 hecliunyx joined #git
11:32 d0nn1e joined #git
11:36 SwingShock joined #git
11:37 metachr0n joined #git
11:39 freimatz joined #git
11:45 thesha how do i bring back changes that i done i a file? i tried git checkout commit_id file name
11:47 _ikke_ That should do
11:47 _ikke_ What changes do you want to bring back?
11:47 orfeo joined #git
11:47 orfeo Hello!
11:48 thesha _ikke_ :  i remove braces then i staged it using git add and after that i use git commit -s -v then i checked again , it was causing extra blank line so i gone to the code and remove the single blank line and save it .now i want the file as it was earlier
11:48 JeroenT joined #git
11:48 willlondon joined #git
11:50 thesha _ikke_: ??
11:52 _ikke_ AS it was before the commit, or after the commit?
11:52 thesha _ikke_: before the commit
11:52 mikecmpbll joined #git
11:53 _ikke_ git checkout HEAD~ <file>
11:53 thesha _ikke_: by mistaken i have already tried git checkout commit_id, will it create a problem?
11:54 _ikke_ No
11:55 marcogmonteiro joined #git
11:55 thesha _ikke_: O wow ..i got it back. thanks a lot :) :)
11:55 ronskisika joined #git
11:55 _ikke_ np
11:56 thesha _ikke_: btw what is the difference between git checkout commit_id <file>  and git chekout HEAD~ <file>
11:56 _ikke_ Nothing
11:57 _ikke_ But perhaps you used the wrong commit id
11:57 g5pw joined #git
11:57 phanimahesh joined #git
11:57 _ikke_ HEAD~ is a way to describe a commit in a relative manner
11:57 _ikke_ while commit_id always specifies that specific commit
11:57 thesha _ikke_: this HEAD~ will point to current commit?
11:57 delboy1978uk joined #git
11:58 delboy1978uk how do i checkout one file from another branch into my current branch?
11:59 thesha _ikke_: ??
11:59 delboy1978uk ah its ok i figured it out
11:59 deadnull joined #git
12:00 flavius joined #git
12:01 mischat joined #git
12:04 osse thesha: previous
12:04 venmx joined #git
12:04 flavius joined #git
12:04 WaReZ joined #git
12:05 delboy1978uk is there a way of diffing an entire branch with another? or at least an entire folder?
12:05 Vampire0_ joined #git
12:05 danslo joined #git
12:05 satifant joined #git
12:05 ismithers1 joined #git
12:05 thesha osse: you mean latest commit?
12:05 rominronin joined #git
12:06 osse thesha: no
12:06 osse thesha: HEAD is latest/current/whatever.  HEAD~ is the one before that
12:06 flavius joined #git
12:08 a_thakur_ joined #git
12:08 dsdeiz joined #git
12:08 dsdeiz joined #git
12:08 thesha osse: by using git add , will my HEAD point to the staging area?
12:09 osse no
12:09 Singmyr joined #git
12:09 thesha osse: if i do commit then only it will point?
12:09 osse yes
12:10 thesha osse: ok ..got it. thanks
12:10 spacelord_ joined #git
12:10 willlondon joined #git
12:11 derk0pf joined #git
12:12 esc Seveas: http://pastebin.com/y067nUCc <-- my fault or somewhere in git-spindle?
12:12 esc I can file an issue, but not sure if known
12:16 encod3 joined #git
12:18 jeffreylevesque joined #git
12:19 marcogmonteiro joined #git
12:19 danslo joined #git
12:20 BadSnappa joined #git
12:20 ochorocho__ joined #git
12:21 manuel_ joined #git
12:22 masuberu joined #git
12:22 UncleCJ joined #git
12:23 Derderderd joined #git
12:24 UncleCJ Hey. Quite some time back, I did something stupid, trying to add or commit way too much binary data (PDFs...) to my repo. Then I ran git fsck, got my .git/lost-found full of somethings and forgot about it. Seems now they aren't recognizable by "file" as anything but data, is there a tutorial anywhere how I can clear up this massive mess?
12:25 UncleCJ Sorry, that would be .git/lost-found/other
12:26 selckin is the problem that you want to rid of lostfound to free space or recover the pdfs or what
12:27 a_thakur joined #git
12:32 ufk joined #git
12:32 ufk hi :)
12:32 selckin !hi
12:32 gitinfo [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
12:32 ufk i commited code in the wrong branch
12:32 ufk can i take a commit from one branch and apply it on another branch ?
12:33 selckin git cherry-pick
12:33 ufk thanks
12:35 encod3 joined #git
12:35 re1 joined #git
12:36 noecc joined #git
12:37 mar77i is there an option for git diff to always run in a pager?
12:37 selckin iirc it does, its the pager that exists
12:38 jdelStrother joined #git
12:38 jdelStrother Heya
12:39 mar77i selckin: hmm, can I pass an option to the pager through git-diff, then?
12:39 osse mar77i: you can set LESS
12:39 selckin .gitconfig core.pager = less
12:39 jdelStrother Say I used to have a file in my repo called kittens.c, but I don't know what directory it was in.   Is there a way of searching for commits affecting that filename?
12:39 selckin you must be passing -F there if it exists
12:40 mar77i osse: oh right, thanks
12:40 Ahiiru joined #git
12:41 bronson joined #git
12:41 Ahiiru while doing git on a wordpress site, is there a way to version control the database? or just the files inside the FTP?
12:43 mar77i osse: so uh, how would I unset -F in LESS?
12:43 garethdaine joined #git
12:43 osse mar77i: by not setting it. if it is set at all then git won't add its own flags
12:43 Nilesh_ joined #git
12:44 osse I mean if LESS is set at all
12:44 joki- joined #git
12:49 delboy1978uk can you git diff myfolder between branches
12:49 delboy1978uk ?
12:50 re1_ joined #git
12:51 UncleCJ selckin: Preferably I'd like to recover the pdfs, they were deleted from the worktree when the add went wrong
12:51 Anticom joined #git
12:52 Anticom Hi all. How can i move the "root" of a branch from one branch to another? I've found this question on SO: http://stackoverflow.com/questi​ons/10853935/change-branch-base
12:53 Anticom i've got a bugfix-branch that's accidentally based on a release branch instead of our development branch
12:53 Anticom now i'd like to move it. I've tried `git checkout bugfix/... && git rebase --onto develop`but that didn't seem to do anything
12:55 WhiskerBiscuit joined #git
12:55 star_prone joined #git
12:55 ojdo joined #git
12:58 osse Anticom: git checkout bugfix-branch; git rebase --onto=develop release-branch
12:58 UncleCJ selckin: By refining my google slightly I found this, will try it soon enough: https://medium.com/@CarrieGuss/how-to-re​cover-from-a-git-hard-reset-b830b5e3f60c#.kc58pd331
12:58 davimore joined #git
12:58 Derderderd joined #git
12:59 cdown_ joined #git
13:00 garethdaine joined #git
13:01 tmsmith joined #git
13:02 jaguarmagenta joined #git
13:03 SpaghettiCat joined #git
13:03 SpaghettiCat Hello, I have a pattern in my .gitignore "*.d" that's meant to ignore some C++ files, but it also means the directory "init.d" is ignored. Is there a way to apply a pattern to regular files only, not directories?
13:04 selckin git never tracks directories
13:04 canton7 selckin, sure, but it tracks the contents of directories, and gitignore applies to directories
13:04 venmx joined #git
13:05 osse selckin: no but you can unignore specific names:  !init.d
13:05 SpaghettiCat selckin: yeah? If I do `git status` it says "Untracked files: etc/"
13:05 JeroenT joined #git
13:05 _Patrick_ joined #git
13:05 canton7 SpaghettiCat, you can unignore init.d with '!init.d'
13:05 SpaghettiCat hmm thanks, that's a good enough solution
13:06 tmsmith joined #git
13:06 al-damiri joined #git
13:07 eduardas_m joined #git
13:08 sdothum joined #git
13:08 synthroid joined #git
13:10 King_Hual joined #git
13:10 King_Hual joined #git
13:10 hahuang61 joined #git
13:11 jeffreylevesque joined #git
13:11 GodGinrai joined #git
13:11 johnmilton joined #git
13:13 Anticom osse: i'm getting "fatal: needed a single revision \n invalid upstream-branch release/..."
13:13 osse Anticom: then you didn't specify the branches properly
13:13 Anticom osse: my autocompletion can't be wrong :p
13:14 osse !repro
13:14 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
13:14 Anticom osse: is this channel logged?
13:14 Anticom it's a company repo :S
13:15 osse it is
13:15 Anticom can i PM you?
13:15 osse either PM, or double check. do you have a local branch and remote branch by similar names?
13:16 Anticom oh.. i guess the remote branch tracking is messed up because of svn import
13:17 Anticom instead of pointing to a remote branch it's referencing a single commit
13:17 osse that's fine
13:18 thesha joined #git
13:18 Anticom $ git branch -avv --> "* bugfix/the-bugfix     00b57b8 [origin/bugfix/the-bugfix] <msg>"
13:21 Eryn_1983_FL joined #git
13:21 ochorocho__ joined #git
13:21 osse Anticom: from the error it seems the release branch is the problem...
13:22 ajf- joined #git
13:22 Anticom osse: preparing a gist. just a second
13:22 wxg joined #git
13:23 JeroenT joined #git
13:23 romerocesar_ joined #git
13:26 cdown joined #git
13:27 Vortex34 joined #git
13:27 tvw joined #git
13:28 thesha I use git checkout HEAD~ <file> to bring back my changes in a file ,but when i did the changes and make it a correct patch to send,the changes are not reflecting inside the patch.
13:30 rudi_s thesha: You need to commit the change.
13:30 thesha rudi_s : how?
13:30 JJjack joined #git
13:31 JJjack hi
13:31 rudi_s thesha: git add + git commit?
13:31 JJjack I pulled a new branch in when merging iget
13:31 JJjack error: The following untracked working tree files would be overwritten by checkout:
13:31 thesha rudi_s : i did that
13:32 JJjack rm readme.md
13:32 JJjack fatal: pathspec 'readme.md' did not match any files
13:32 rudi_s thesha: On the correct branch? Do you have a detached head?
13:32 thesha rudi_s : detached head??
13:32 osse JJjack: it's untracked, so git can't delete it. do it yourself
13:32 thesha i didn't get it
13:32 rudi_s thesha: git status will tell you.
13:33 thesha rudi_s : yes it is showing
13:33 rudi_s (It's a term when you aren't on any branch so your commits seem to be lost. It happens when you run git checkout <commit> without a file.)
13:33 rudi_s thesha: It says "HEAD detached"? Then create a new branch from the current commit with git checkout -b test-branch and then use gitk --all or tig --all to verify where your current commit is.
13:34 JJjack but I dont see anything in git status
13:34 Cavallari joined #git
13:34 JJjack I tried git add .
13:34 rudi_s JJjack: Is it ignored?
13:34 JJjack no
13:36 jbitdrop joined #git
13:36 thesha rudi_s : what is the second command gitk --all??
13:36 ocbtec joined #git
13:36 rudi_s thesha: It displays the current repository layout visualizing the branches and commits (--all displays all commits).
13:37 fahadash joined #git
13:37 thesha rudi_s : gitk --all  says: commond not found
13:37 thesha s/commond/command
13:38 rudi_s thesha: Either install it or try: git log --pretty=oneline --graph --all --decorate --abbrev-commit
13:38 sdlnv joined #git
13:38 wxg joined #git
13:39 dan2k3k4 joined #git
13:40 bsanford joined #git
13:40 rtjure joined #git
13:41 thesha rudi_s :i installed gitk ,the command gitk --all shows some graphical representation.Now what i have to do now?
13:42 rafalcpp joined #git
13:42 chll_ joined #git
13:42 invisbl joined #git
13:43 Darcidride joined #git
13:44 Anticom osse: btw for !repo i'd recommend adding asciinema. That way you see what the user **actually** sees
13:44 gitinfo osse: Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. https://source.android.com/source/using-repo.html
13:45 Balliad joined #git
13:45 jeffreylevesque joined #git
13:45 Anticom Oh and thanks for helping me out btw :)
13:47 thesha rudi_s : ??
13:50 rominronin joined #git
13:51 Balliad joined #git
13:53 ochorocho__ joined #git
13:53 rominron_ joined #git
13:53 romerocesar joined #git
13:55 ToBeCloud joined #git
13:57 rudi_s thesha: You have a look where the commit occured.
13:57 maroloccio joined #git
13:57 rudi_s And if you intend to apply this change to the master branch, the simplest solution is to switch back to master (losing the commit in the process), redoing the checkout for the file, committing the changes on the master branch.
13:57 OOPManZA joined #git
13:58 ToBeCloud_ joined #git
13:59 Derderderd joined #git
14:00 cdown_ joined #git
14:01 diogenese joined #git
14:02 wxg joined #git
14:02 jaguarmagenta joined #git
14:02 ExoUNX joined #git
14:02 robnester joined #git
14:04 rnsanchez_ joined #git
14:05 venmx joined #git
14:06 thesha rudi_s :do i need to note down the SHA id?
14:06 nettoweb joined #git
14:07 thesha rudi_s :i was able to see the changes there in gitk what should i do now?
14:07 dan2k3k4 joined #git
14:09 shgysk8zer0 joined #git
14:09 cdown_ joined #git
14:09 diogenese joined #git
14:10 theoceaniscool joined #git
14:11 lmatteis joined #git
14:11 porsche944 joined #git
14:11 _rnsanchez_ joined #git
14:11 rorro joined #git
14:12 yogesh_ joined #git
14:13 jimi_ joined #git
14:15 cdown_ joined #git
14:16 shgysk8zer0 left #git
14:18 manuel_ joined #git
14:23 rnsanchez joined #git
14:26 _ng joined #git
14:26 cdown joined #git
14:27 anonymuse joined #git
14:28 nicksloan joined #git
14:29 DolphinDream joined #git
14:29 DolphinDream howdy gitsters
14:30 sdothum joined #git
14:30 DolphinDream i am trying to do a git rebase interactive.. adn stop for edit (e).. but I cant see the current commit changes being present in my working folder or in the stage area when the rebase stops for edit (git status does not show local changes or staged)
14:30 DolphinDream any ideas what i'm doing wrong ?
14:31 moritz they are already committed
14:31 moritz so 'git show' should show them
14:31 Singmyr joined #git
14:31 moritz you can do your changes, add them to the index, and then do a git commit --amend
14:31 DolphinDream aha... commited behind the scene (not quite yet officially commited) ?
14:31 cdg joined #git
14:32 DolphinDream moritz: waht i want to do actually is to revise each commit.. as if they are in my working directory so that i can recommit them.
14:32 romerocesar joined #git
14:32 cdown_ joined #git
14:32 shinnya joined #git
14:33 Dougie187 joined #git
14:33 DolphinDream is there a way to do rebase interactive where each commit is dumped into the working directory and pause so i can do the edits and re-stage and recommit myself ?
14:33 DolphinDream should i rather to this with the cherry pick .. one commit at a time ?
14:34 Balliad joined #git
14:34 rishi joined #git
14:34 willlondon joined #git
14:34 kadoban DolphinDream: Is it really any harder to --amend ?
14:35 perlpilot joined #git
14:35 kadoban If you want, there's a way to just undo a commit and leave it in working directory ... what is it, git reset HEAD~1 maybe? Wouldn't trust that, I haven't slept in a while, but it's one of those.
14:35 DolphinDream kadoban: you suggest to do --amend for each of the (multiple) commits i rebase  ?
14:36 kadoban DolphinDream: Sure?
14:36 DolphinDream kadoban: I want to see the files that are modified by each commit.. so i can make slight changes. but when the interactive rebase stops it does not show me the current commit diffs relative to the previous commit (as working dir changes) so it's hard to see what are the changes introduced by the current commit being replayed
14:37 kadoban Fair enough. Ya, I'd do the reset thing then I guess.
14:37 qqx DolphinDream: `git show` ?
14:37 Derderderd joined #git
14:38 Gsham joined #git
14:38 qqx But if you truly want to see the changes as unapplied you can use `git reset @~` to undo the commit, leaving the changes in only the working tree.
14:39 DolphinDream qqx sure .. that does show the diff. but what if i want to use a visual editor (meld, smartgit, gitg etc) to visualize the diffs and handpick only the changes i want to include in the next commit ? If I had the files/changes not commited, but checkedout as working dir changes i can look at the changes in GUI editors and hand pick the chances i want to keep.
14:39 watmm joined #git
14:39 osse git difftool
14:39 boombatower joined #git
14:40 JeroenT joined #git
14:40 Caelum joined #git
14:40 watmm Hey, im getting "Protocol error" messages for files that don't exist. The files have the '@' symbol in their path for some reason. Anyone ever see this?
14:40 DolphinDream osse: during the interactive rebase the difftool doesn't do anything apparently. (though git show does show me diffs)
14:40 shanapu joined #git
14:40 roelmonnens joined #git
14:40 wxg joined #git
14:41 delboy1978uk left #git
14:41 osse what stage in the rebase process are you in? a conflict? or did you mark a commit 'edit' ?
14:41 koenvg joined #git
14:42 bronson joined #git
14:42 Dougie187 joined #git
14:42 DolphinDream osse:  there is no conflict. I want to rebase interactive and remove some of the changes made in each commit. So i did a e (for edit) for each commit and expected that the rebase will pause for each commit and show the commit changes ad working dir changes that I can then edit, stage, comitt and contineu the rebase.
14:42 gitterbug joined #git
14:42 DolphinDream osse: the later (marked as "edit")
14:43 osse DolphinDream: in that step the commit has already been made and you're supposed to use git commit --amend to modify it
14:43 MattE joined #git
14:43 osse you can do git difftool @~ then
14:43 DolphinDream osse: sure.. i can use amend but first i need to see what files are modified.. and what are the chagnes introduced in those files relative to the previous commit so that i know what changes to keep and what to throw away.
14:44 gitterbug Hi -- how can I determine which commit ids were rolled up into a merge -- trying to search across all branches
14:44 DolphinDream osse: hm.. @~ ? that does something.
14:44 DolphinDream what is @~ ?
14:44 osse DolphinDream: sounds like you want to do 'git reset @q' and do the commit again
14:44 osse same as HEAD~
14:44 DolphinDream aha
14:44 DolphinDream @q ?
14:45 DolphinDream i know HEAD~ :)
14:46 DolphinDream so the interactive commit does a commit behind the scene and only update the branch/head to point to it once you amend and continue I take?
14:46 qqx DolphinDream,osse: I suspect that @q was a typo for @~
14:46 osse DolphinDream: yes. it informs you of this. "make your changes then do git commit --amend ..." etc.
14:46 qqx DolphinDream: It doesn't update the branch until you finish the entire rebase process.
14:47 BSaboia joined #git
14:47 JJjack joined #git
14:47 saml joined #git
14:48 Miika-- Hello, when I do git rev-list --format="some format", I get formatted string but also some "commit hash" -formatted lines, which I do not want... how I can suppress them?
14:49 bannakaffalatta joined #git
14:51 wxg joined #git
14:52 ketas- joined #git
14:52 osse Miika--: you can u se git log
14:53 gitterbug To rephrase my question differently, I have a large repo where the commit message is a really high level summary, and I want to drill down to the individual commit messages that were merged into the former. How can I find which commits those were?
14:53 leeN joined #git
14:54 osse gitterbug: git log merge^1..merge
14:54 osse that's the log of all commits that were merged in
14:55 _Vi joined #git
14:55 BrianJ joined #git
14:55 koenvg Hi! I am doing a "git rebase -i ..." to fix the author field of a few commits. However, during the second "git rebase --continue", I get this error: "fatal: empty ident name (for <unknown>) not allowed". What is causing this? I have set my own name and email in .gitconfig
14:58 nickabbey joined #git
14:59 Gsham joined #git
15:00 tmsmith joined #git
15:00 Miika-- osse: if I use git log --format="%H" -- file, is it same as git rev-list --all -- file?
15:02 DolphinDream osse: so reset HEAD~ does the trick (which unstaged the changes) but my question is why were the staged changes not listed when i do a git status ? I only see untracked files but no staged or local changes .
15:02 e14 joined #git
15:02 osse Miika--: almost. same as git rev-list HEAD -- file
15:02 jimi_ joined #git
15:02 SwingShock If i have a forked repository, how to update it to become the same as the one that it is forked from if it accepted another pull request.
15:02 anonymuse joined #git
15:02 osse DolphinDream: because there aren't any!
15:02 DolphinDream my guess is that like people said.. the changes are already applied to a commit (which can be ammended) even though this commit is not yet officially part of the replayed history
15:03 osse DolphinDream: like i said, the commit is already applied. you're supposed to make changes and then use --amend
15:03 cdown_ joined #git
15:05 ketas joined #git
15:05 AaronMT joined #git
15:05 wxg joined #git
15:05 cdown__ joined #git
15:06 DolphinDream osse: yeah. i got it. :) thx. the git reset HEAD~ after every replayed commit is the behavior i wanted :)
15:06 venmx joined #git
15:07 upenox joined #git
15:08 invisbl joined #git
15:10 dreiss joined #git
15:11 hahuang61 joined #git
15:13 wxg joined #git
15:14 xall joined #git
15:16 Black_knight joined #git
15:16 Black_horse joined #git
15:17 nohop joined #git
15:17 thesha joined #git
15:19 bronson joined #git
15:20 Spiney joined #git
15:20 govg joined #git
15:20 ochorocho__ joined #git
15:21 theoceaniscool joined #git
15:21 theoceaniscool joined #git
15:22 nohop hey guys. I have a weird problem with rebasing (It's also the first time i used it, so i'm probably doing something really dumb)
15:23 nohop I want to rebase my branch with origin/master. My local branches are in sync with those on github.
15:23 nohop When i do a rebase origin/master, all the changes that i made to my local branch are gone.
15:24 nohop (which are changes that i have pushed to the server.)
15:24 nohop What am I missing ?
15:25 Balliad joined #git
15:26 nohop (I HAVE done a rebase --abort before that, because i accidentally didn't have my branches in sync... maybe that has something to do with it?)
15:27 nettoweb joined #git
15:27 _ikke_ nohop: Did you complete the rebase, or is it waiting for you to fix and continue?
15:27 cdown joined #git
15:27 _ikke_ What does git status say?
15:28 roelmonnens joined #git
15:28 nohop i did not finish it. The problem is that, after i do git rebase origin/master, it seems to revert my local branch to an older commit...
15:28 evie_hammond joined #git
15:28 nohop as in, older than the latest on github
15:29 dan joined #git
15:29 nohop so, it's not finished at all :) I'm not even starting because I don't feel like re-doing everything i did :)
15:29 selckin git fetch ?
15:29 nohop i have
15:29 nohop my local branches are in sync with those on github
15:30 Linux-Ninja01 joined #git
15:30 wxg joined #git
15:31 nohop _ikke_: after rebase origin/master? It says there are TONS of changes... which isn't true. Like i said, my local branch at the time of typing git rebase origin/master is exactly the same as the one on github
15:32 _ikke_ read good what git status says
15:32 tobiasBora joined #git
15:33 Ardethian\work joined #git
15:34 kjbrjwqsevveohhm joined #git
15:34 cdg joined #git
15:35 nohop _ikke_: i'm not sure what you mean
15:35 Spiney joined #git
15:35 nohop it sais rebase in progress; onto 14b5af7 (which is master)
15:36 ams__ joined #git
15:36 nohop that doesn't explain why it reverts my local branch to an old commit, which is neither the latest of the branch i'm working on, NOR the latest master branch
15:37 _ikke_ The rebase is still in progress
15:37 _ikke_ It ran into a conflict
15:37 nohop hmm
15:37 nohop but i did git rebase --abort
15:37 nohop then git feth origin
15:37 _ikke_ before or after the last rebase?
15:37 nohop then did rebase origin/master again
15:38 nohop ok... let me go chronologically :)
15:38 Derderderd joined #git
15:38 _ikke_ (according to git, the rebase is still in progress)
15:38 nohop yeah, because i just did a new rebase, because i though you wanted to know what git status sais :)
15:39 nohop if you just wanted to know the status after i aborted it, that would be 'clean'
15:39 cdown joined #git
15:39 rmainanon joined #git
15:40 cdg joined #git
15:40 albel727 joined #git
15:41 nohop meh... whatever.. I'll just ask my boss to merge all this shit into master... This is taking way too much time now
15:41 nohop thanks anyways
15:41 guardian hello, is there a syntax to synchronize a submodule to a specific SHA1 without checking it out first?
15:41 cdown_ joined #git
15:42 NathanI_ joined #git
15:42 bdonnahue joined #git
15:43 ResidentBiscuit joined #git
15:43 ResidentBiscuit joined #git
15:43 ResidentBiscuit joined #git
15:44 jasondockers joined #git
15:46 _ng joined #git
15:46 wxg joined #git
15:47 OOPMan joined #git
15:48 nikivi joined #git
15:48 Renter anyone know about gitlab in here? I have a stupid question
15:49 Renter I've been using git for two years and am still a bit fuzzy about rebase / merge
15:49 Nerbrun joined #git
15:49 thesha rudi_s : ping
15:49 phanimahesh joined #git
15:50 Renter anyway, I have a merge request active and it's saying "Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged." with a button 'rebase onto <target>', should I just click that button, do something manually with the source branch or target branch?
15:51 Renter mainly, if I push that button, will it affect the source branch or target branch, it says target
15:52 mischat joined #git
15:53 Neelixx joined #git
15:53 jaafar joined #git
15:53 Darren_ joined #git
15:54 bejeb joined #git
15:54 romerocesar joined #git
15:55 Guest59500 joined #git
15:56 dsdeiz joined #git
15:56 rudi_s thesha: Simplest solution is to apply the changes manually on master. Or you can note the commit it, change to master (git checkout master) and then git cherry-pick commit-id to bring that change onto the master branch.
15:57 salamanderrake joined #git
15:58 nanga joined #git
15:58 nanga joined #git
16:00 davimore_ joined #git
16:01 danslo joined #git
16:01 rominronin joined #git
16:01 Black_knight joined #git
16:02 theoceaniscool joined #git
16:03 thesha rudi_s : nothing new happens,same as before. should i change the file manually?
16:04 los joined #git
16:04 rudi_s thesha: Then you're doing it wrong.
16:04 rudi_s You have the change on the current branch (which is detached). After changing to the master branch and cherry-picking the commit, something will happen.
16:05 steeze joined #git
16:06 MillerBoss joined #git
16:06 thesha rudi_s : this is what i got https://paste.fedoraproject.org/509780/
16:06 AustinMatherne joined #git
16:06 thesha after doing the commands you told
16:07 crayon joined #git
16:07 Shentino joined #git
16:07 venmx joined #git
16:08 rominron_ joined #git
16:09 rudi_s thesha: So you didn't commit any changes, at least in relation to the master branch.
16:09 tmz joined #git
16:09 davimore_ joined #git
16:09 rudi_s But as I said, just perform the change you want manually while on the master branch and commit it.
16:09 rorro joined #git
16:09 stevenxl joined #git
16:11 trelane joined #git
16:11 trelane joined #git
16:11 sdlnv joined #git
16:11 invisbl joined #git
16:12 stevenxl Hello folks. I have a bit of a problem, and I want to get some ideas from the pros on how to fix this issue. Basically I have one branch (master) with commits (A B C D E F G), and another branch (dev) with commits (A B C D E X Y Z). I want to take the changes from dev (X Y Z) and put them in master, so that master looks like (A B C X Y Z D E F G).
16:12 comps joined #git
16:12 Singmyr joined #git
16:12 menip joined #git
16:12 stevenxl Is there a concept for what I am trying to do?
16:12 Linux-Ninja01 left #git
16:12 satifant joined #git
16:14 jaguarmagenta joined #git
16:14 selckin joined #git
16:14 nettoweb joined #git
16:15 Seveas esc: always your fault :P
16:15 Seveas My code has no bugs
16:16 LionsMane joined #git
16:17 dan_ joined #git
16:18 mischat joined #git
16:18 byte512 joined #git
16:19 nanga joined #git
16:21 bronson joined #git
16:21 GodGinrai joined #git
16:22 GodGinrai joined #git
16:22 cjohnson stevenxl: is your dev branch used by other people?
16:22 stevenxl cjohnson: No.
16:23 fahadash joined #git
16:23 cjohnson well, you could rebase your dev branch
16:23 cjohnson bringing F G into dev so that X Y Z happen sequentially after F G
16:23 cjohnson then simply merge dev to master
16:24 cjohnson rebasing your dev branch rewrites history though which requires a force push, which you don't want to do on branches others are using
16:24 gtristan joined #git
16:24 drbean joined #git
16:25 a_thakur joined #git
16:25 cjohnson if not, you can cherry pick X Y Z into master
16:25 wxg joined #git
16:25 subhojit777 joined #git
16:26 stevenxl cjohnson: thank you for both those options. If I do cherry-pick, can I "stick" the commits into master at any point, or do they go on after the current HEAD of master?
16:26 DolphinDream how do i check the changes introduced by two commits SHA1/ SHA2 (on different branches) (one was possibly cherry picked from the other branch and perhaps even amended). I want to exclude diffs for all the commits in between SHA1 and SHA2
16:26 stevenxl cjohnson: No one else uses the dev branch, so I think that rebasing dev from master might be the way to go.
16:27 GodGinrai stevenxl: very first sentence in the manpage for git-cherry-pick: "Given one or more existing commits, apply the change each one introduces, recording a new commit for each."
16:27 rorro joined #git
16:28 steeze joined #git
16:28 setuid joined #git
16:29 drbean_ joined #git
16:29 stevenxl GodGinrai: got it thank you
16:29 GodGinrai DolphinDream: you want to diff the changes?
16:31 a_thakur joined #git
16:32 jccn joined #git
16:33 DolphinDream GodGinrai: yep.. A->B->C and A->D->E .. i want to diff the changes introduced by C and E .. where E is a cherrypick of C + some amends .. i want to compare C and E without including the changes introduced by B and D
16:33 ochorocho__ joined #git
16:34 e14 joined #git
16:34 nickabbey joined #git
16:35 Vortex34 joined #git
16:35 Alsino joined #git
16:35 GodGinrai DolphinDream: gut instinct is telling me diff the output of git diff for each commit
16:36 GodGinrai DolphinDream: for example: `diff "$(git diff B C)" "$(git diff D E)"`
16:37 Renter I read that 'git instinct' and thought what a wonderful idea that would be
16:37 GodGinrai the ordering of the commits might be different
16:37 pkiller_ joined #git
16:37 GodGinrai Renter: lol
16:38 Lea2 joined #git
16:38 koenvg How bad is it if "git fsck" complains about a repository because an author field is bad?
16:38 wxg joined #git
16:38 _ikke_ I think it's not that bad
16:38 koenvg I was having trouble fixing the author field, so now I wonder if it's needed at all
16:38 Derderderd joined #git
16:39 setuid Did my last post go through? Don't want to re-post if it did :) (having irccloud/join issues)
16:39 _ikke_ man git config, look for fsck.skipList
16:39 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
16:40 floatingman joined #git
16:40 GodGinrai setuid: what forum are you posting to?
16:40 _ikke_ setuid: I don't see any earlier messages from you
16:40 setuid GodGinrai: Here, in irc... at 10:59:07am eT
16:40 setuid I'm trying to solve an interesting problem... git CLI on Windows, eventually run as a scheduled task, but for now, interactive. What's the best way to commit changes to a tree of data in %USERDATA%\Documents\Foo to -another- location, so if \Documents\Foo is blown away, it can be recovered easily?
16:41 tobiasBora joined #git
16:41 GodGinrai setuid: push to a repo?
16:41 kadoban setuid: git does not replace backups
16:41 _ikke_ with kadoban
16:41 koenvg ikke: thank you, that seems like just the thing I need!
16:41 setuid kadoban: Agreed, that's not the goal, just trying to keep some data merged and intact
16:41 GodGinrai kadoban: _ikke_: I agree if he is doing this to backup his documents
16:41 setuid GodGinrai: No upstream, these are Windows users, very basic understanding
16:42 setuid No, not to back up documents, I use rsnapshot for that (on Windows)
16:42 _ikke_ setuid: just make a full file-system copy of the repository
16:42 _ikke_ that will include things like settings, ignored files, reflog, which are not covered with just pushing
16:42 setuid I'm trying to document an easy way for users of an app to commit their ride logs (fitness app) to a local repo, where they can pull it back out later, base on date/time/etc.
16:43 setuid I could use SyncToy, I guess... not very robust, monolithic, but it could work
16:43 cjohnson upstream can be another local repo setuid
16:43 GodGinrai ^ this was my point
16:43 cjohnson I've used that setup where I had a server that stored both the working copy and the authoritative source (bare repo)
16:44 cjohnson on my local machine I do work, push to bare source, then on the server I go into the working copy and pull from that same source
16:44 setuid Ok, so create a repo in the tree of the data I'm merging, and then create another one elsewhere on the same fs, and commit across?
16:44 Alsino left #git
16:44 cjohnson push not commit
16:44 GodGinrai setuid: push
16:44 cjohnson and it would be a bare copy for the authoritative one
16:44 cjohnson no working files
16:44 setuid er, right
16:45 Vampire0 joined #git
16:47 misgit joined #git
16:47 holgersson joined #git
16:47 Travis-42 joined #git
16:48 tobiasBora joined #git
16:48 Travis-42 I'm trying to figure out what went wrong with someone's merge conflict and conflict resolution. How can I see what merge conflicts were faced in the merge?
16:49 synthroid joined #git
16:49 GodGinrai Travis-42: I believe `git status` tells you
16:49 GodGinrai which files
16:50 GodGinrai then you just check those files
16:50 tvw joined #git
16:51 Travis-42 how would I get into that state? try to check out the commit before the merge and try to perform the merge myself?
16:52 wxg joined #git
16:52 Siegfried joined #git
16:52 Travis-42 I was hoping there was some command I could run on the merge commit itself
16:53 GodGinrai Travis-42: the merge commit doesn't exist if there are conflicts
16:53 Travis-42 the conflicts were resolved and the merge commit was made a while ago
16:53 Travis-42 there were just problems with how they resolved the conflicts
16:53 GodGinrai OHH
16:53 grawity check out the first parent, and try to merge the 2nd
16:53 Travis-42 and I'm having trouble figuring out what the conflicts were, and how they resolved them :-)
16:53 grawity then see what happens
16:54 grawity because Git doesn't really store much else than that
16:54 grawity just the state before and the state after
16:55 Travis-42 hmm, I'm surprised I can't get it to show the particular changes that the git commit author authored in resolving the conflicts, but I can work it out this way I guess
16:55 grawity hmm, well
16:55 grawity `git show -3 <mergecommit>` would probably help
16:56 GodGinrai OHHhttp://stackoverflow.com/questions/152777​08/how-do-you-see-show-a-git-merge-confli​ct-resolution-that-was-done-given-a-mer
16:56 grawity maybe without the -3, I forget.
16:56 GodGinrai whoa
16:56 GodGinrai not sure what just happened with my paste
16:56 Gloomy joined #git
16:56 GodGinrai http://stackoverflow.com/questions/152777​08/how-do-you-see-show-a-git-merge-confli​ct-resolution-that-was-done-given-a-mer
16:56 GodGinrai ^ that sounds like someone wanting to do the same thing as you
16:57 GodGinrai and he accepted the answer
16:57 Travis-42 ok, this is helpful too, thanks
16:59 manveru joined #git
16:59 synthroi_ joined #git
16:59 manveru hey guys, is there any way to get the sha of the object a specific remote branch points to without cloning the repo?
17:00 unbalanced joined #git
17:00 kadoban manveru: 'git ls-remote' can tell you
17:02 rominron_ joined #git
17:03 wxg joined #git
17:05 Derderderd joined #git
17:06 fiter joined #git
17:07 theoceaniscool joined #git
17:07 raspado joined #git
17:07 d0nkeyBOB joined #git
17:08 venmx joined #git
17:08 bronson joined #git
17:09 tyreld joined #git
17:09 manveru kadoban: thanks a lot
17:09 breezy_ joined #git
17:10 kadoban anytime
17:12 hahuang61 joined #git
17:12 dreiss joined #git
17:13 robotroll joined #git
17:14 romerocesar joined #git
17:15 cyan__ joined #git
17:16 sLite joined #git
17:17 cjohnson ANY time?
17:17 * cjohnson makes note
17:19 aard_ joined #git
17:19 GodGinrai hey guys, how do I get tab-completion working for git in bash on Mac OS X?
17:19 GodGinrai it doesn't seem to be working for me
17:21 canton7 GodGinrai, https://github.com/git/git/blob/master/co​ntrib/completion/git-completion.bash#L18
17:21 maroloccio joined #git
17:23 tanuki joined #git
17:23 averell joined #git
17:25 madewokherd joined #git
17:25 raspado joined #git
17:27 algun joined #git
17:27 Tobias_ joined #git
17:28 dviola joined #git
17:29 GodGinrai canton7: thanks
17:29 vuoto joined #git
17:29 sea-gull_ joined #git
17:32 tanuki joined #git
17:32 misgit joined #git
17:33 crayon joined #git
17:36 govg joined #git
17:38 rominronin joined #git
17:39 a3Dman joined #git
17:40 kumarsuraj joined #git
17:41 msonntag joined #git
17:42 griffindy joined #git
17:42 tang^ joined #git
17:42 nickabbey joined #git
17:46 thesha joined #git
17:48 JJjack joined #git
17:52 jimi_ joined #git
17:54 Gsham joined #git
17:58 xall joined #git
17:58 spacelord_ joined #git
18:00 Salander27 joined #git
18:00 thesha when i run git status it shows Your branch is ahead of 'origin/master' by 6 commits.
18:00 thesha is it because i have not done git push?
18:01 realz joined #git
18:01 xpk joined #git
18:01 xpk joined #git
18:01 svm_invictvs joined #git
18:01 thiago thesha: yes
18:01 garethdaine joined #git
18:02 thesha thiago, is it compulsory to do git push?
18:02 garethdaine joined #git
18:02 thiago thesha: no
18:03 thiago thesha: you do it if you want to
18:04 dreiss joined #git
18:04 thesha thiago, thanks
18:05 kumarsuraj joined #git
18:06 regedit joined #git
18:06 acetakwas joined #git
18:07 thesha thiago, i am not able to do git commit
18:07 thesha On branch master
18:07 thesha Your branch is ahead of 'origin/master' by 6 commits.
18:07 thesha (use "git push" to publish your local commits)
18:07 thesha You are currently cherry-picking commit aa4f267.
18:08 thesha what should i do to make commmit?
18:09 venmx joined #git
18:09 hashpuppy joined #git
18:13 cmn joined #git
18:13 _ikke_ git cherry-pick --continue
18:13 _ikke_ I guess
18:14 Vampire0 thesha, as the message says, you are in the middle of a cherry-pick. Either abort ist, or continue it or finish it, then you can commit normally again
18:15 jnavila joined #git
18:15 jaguarmagenta joined #git
18:15 stevenspasbo joined #git
18:19 Derderderd joined #git
18:20 thesha _ikke_, Vampire0 : is it happening because i have created git test-branch?
18:21 holgersson joined #git
18:21 thesha i also tried git cherry-pick commit_id
18:21 matsaman joined #git
18:21 duderonomy joined #git
18:22 Ufm joined #git
18:24 DolphinDream scripting question.. how do I test if a file differs between two commits ? this one doesn't seem to work : if git diff $SHA1 $SHA2 -- $filename > /dev/null; then echo "the files differ"; else echo "no difference"; fi
18:24 _ikke_ thesha: Don't know what you exactly did, but I don't think creating a branch has to do with it
18:25 InfoTest joined #git
18:25 _ikke_ DolphinDream: --quiet
18:25 _ikke_ (implies --exit-code)
18:25 SwiftMatt joined #git
18:25 DolphinDream _ikke_: --quiet instead of >/dev/null ?
18:26 _ikke_ sure, but it also implies --exit-code, which makes it exit 1 on diff
18:26 InfoTest joined #git
18:26 DolphinDream why do i get a "files differ" if i compare SHA1 with SHA1 ?
18:26 _ikke_ Don't know?
18:26 garethdaine joined #git
18:27 matsaman because they differ, probably
18:28 InfoTest joined #git
18:29 ikrabbe left #git
18:30 thesha _ikke_, i was about to bring back changes that i have done in a file ,so it was not happening ,also tried git checkout HEAD~ <file>,so i created another test-branch and switch to it ,then i did git cherry-pick commit_id
18:32 freimatz joined #git
18:33 Balliad joined #git
18:33 todder joined #git
18:33 mikecmpbll joined #git
18:33 BrianJ joined #git
18:33 LionsMane joined #git
18:34 BrianJ joined #git
18:34 BrianJ joined #git
18:35 BrianJ joined #git
18:36 BrianJ joined #git
18:37 BrianJ joined #git
18:38 BrianJ joined #git
18:38 BrianJ joined #git
18:39 DolphinDream _ikke_: i found out why :)
18:40 nettoweb joined #git
18:40 DolphinDream _ikke_: i was not in the root folder ... and I used the full path of the file :)
18:40 vdv joined #git
18:40 InfoTest joined #git
18:41 sLite joined #git
18:41 hkandala joined #git
18:42 InfoTest joined #git
18:42 wxg joined #git
18:44 JJjack joined #git
18:45 hhee joined #git
18:46 aarobc joined #git
18:47 DolphinDream _ikke_: http://pastebin.com/CmHgm5X8 . any ideas why the scripts craps out after difftooling the first file? (instead of difftooling every file that is different?)
18:48 mischat joined #git
18:50 romerocesar_ joined #git
18:52 jagob joined #git
18:53 synthroid joined #git
18:53 nickabbey joined #git
18:55 synthro__ joined #git
18:55 troulouliou_div2 joined #git
18:55 d^sh joined #git
18:56 doener joined #git
18:57 roman joined #git
18:59 cagedwisdom joined #git
19:00 roman joined #git
19:02 roman joined #git
19:02 orfeo joined #git
19:03 Discovery joined #git
19:04 Sasazuka joined #git
19:05 roman joined #git
19:06 IlNominePatre joined #git
19:07 roman joined #git
19:09 roman left #git
19:09 rominronin joined #git
19:11 ixjlyons joined #git
19:11 raspado joined #git
19:13 M-ou-se_ joined #git
19:13 venmx joined #git
19:13 mmmikey joined #git
19:13 kenansulayman joined #git
19:14 avizmarlon joined #git
19:14 psyb0t joined #git
19:14 nd joined #git
19:15 IlNominePatre joined #git
19:15 misgit joined #git
19:15 avizmarlon I found a problem in Git documentation, how can I report?
19:16 nwkj86 joined #git
19:17 ghostlight joined #git
19:17 govg joined #git
19:18 garethdaine joined #git
19:18 synthroid joined #git
19:19 dsantiago joined #git
19:19 _Vi joined #git
19:19 Balliad joined #git
19:22 e14 joined #git
19:24 Derderderd joined #git
19:24 dsantiag_ joined #git
19:26 Sasazuka joined #git
19:27 aarobc joined #git
19:29 denisMone joined #git
19:31 Neelixx joined #git
19:31 aidalgol joined #git
19:32 Atm0spher1c joined #git
19:32 thiago joined #git
19:33 vuoto joined #git
19:35 corn13read joined #git
19:36 blahdodo joined #git
19:36 Sasazuka joined #git
19:38 sbeller joined #git
19:38 Singmyr joined #git
19:42 Ahiiru joined #git
19:42 Ahiiru hello there
19:43 Ahiiru at my terminal, I'm trying to use this command: git pull origin master
19:43 Ahiiru it's all good, but its asking for a certain user's password to proceed
19:43 noecc left #git
19:43 Ahiiru what is the syntax to do the pull with -my- user?
19:44 Ahiiru so I can use my password
19:45 phroa generally you edit the URL of origin to be your username@thedomain instead
19:45 sLite joined #git
19:46 Ahiiru like this? git pull user@domain/project.git origin master?
19:47 Ahiiru or without "origin"?
19:47 preaction you could do that without "origin" yes
19:47 Ahiiru hm ok
19:47 preaction or you could git remote set-url origin <new url without user in it>
19:47 e14 joined #git
19:49 GodGinrai joined #git
19:49 _ikke_ Or you use a credential helper
19:50 multi_io_ joined #git
19:50 GodGinrai joined #git
19:50 misgit left #git
19:51 Ahiiru it worked good ^^ thanks
19:55 finalbeta joined #git
19:56 thesha joined #git
19:56 nickabbey joined #git
19:57 fling joined #git
20:01 Sebastian joined #git
20:01 Sebastian left #git
20:02 SebastianM joined #git
20:02 DolphinDream how do you cherry pick and keep the original author name ?  (also in case of conflicts)
20:03 derk0pf joined #git
20:04 _ikke_ Doesn't git automatically reuse the author (but not the comitter)?
20:07 hahuang61 joined #git
20:07 lb joined #git
20:07 SebastianM Hey guys. Trying to push a repo to remote, getting the error "submodule paths contain changes that can not be found on any remote" although all submodules are pushed to remote. http://pastebin.com/xV4zpf3t Can somebody help? (-:
20:10 venmx joined #git
20:12 cdg_ joined #git
20:13 crayon joined #git
20:15 onmeac joined #git
20:15 cyan__ joined #git
20:15 BrianJ joined #git
20:16 jaguarmagenta joined #git
20:16 PresidentElect joined #git
20:16 PresidentElect Is it possiible to even get git to work with ssh keys in windows?
20:16 xall joined #git
20:17 sbeller SebastianM: that is an odd error message :(
20:18 SebastianM PresidentElect: Yes, it is definitely. Are you using GitBash?
20:18 PresidentElect SebastianM: yes
20:18 PresidentElect I've generated myself a key using ssh-keygen, but it is then telling Git to use that one
20:19 Salander27_ joined #git
20:20 toothe left #git
20:22 SebastianM PresidentElect: Unfortunately, it is some time ago that I used it. Does the second section of this page help? https://help.github.com/articles/generating-a​-new-ssh-key-and-adding-it-to-the-ssh-agent/
20:23 Sample joined #git
20:24 matsaman joined #git
20:25 hahuang61 joined #git
20:25 jbitdrop joined #git
20:27 PresidentElect huh ok SebastianM! Works! Thanks. My mistake was using cmd not git bash
20:27 snowkidind joined #git
20:27 iamthad joined #git
20:29 irco joined #git
20:30 Salander27 joined #git
20:31 rominronin joined #git
20:31 tang^ PresidentElect: so, yes
20:31 tang^ I use ssh keys with bash and powershell
20:32 PresidentElect tang^: git bash will do!
20:32 tang^ VS doesn't understand keys, though so you have to drop out of VS to use git with ssh-secured repos
20:32 PresidentElect But it appears to be ok :)
20:32 tang^ but the VS git implementation is weak so that's nbd
20:32 countingdaisies joined #git
20:32 PresidentElect tang^: I'm only just learning git so I want it all done via cli for now anyways
20:33 tang^ other GUIs, like SourceTree will launch ssh-agent for you
20:34 iamthad joined #git
20:34 tang^ wow... didn't even realize this convo was in a different channel
20:35 tang^ PresidentElect: you'll get lots of good cli help in here
20:36 dodobrain joined #git
20:37 GodGinrai lol
20:38 iamthad joined #git
20:39 Es0teric joined #git
20:40 sea-gull_ joined #git
20:40 PresidentElect tang^: Aye. Not using much of git though
20:40 PresidentElect At work it's all about the svn
20:40 finalbeta joined #git
20:40 iamthad joined #git
20:41 rominron_ joined #git
20:43 _28_ria joined #git
20:45 sLite joined #git
20:45 askb joined #git
20:45 flavius joined #git
20:48 ispn joined #git
20:49 dsteplight__ joined #git
20:52 manuelschneid3r joined #git
20:55 trobotham joined #git
20:56 maroloccio joined #git
20:57 DieguezZ joined #git
20:58 SwiftMatt joined #git
21:01 Balliad joined #git
21:01 Sasazuka joined #git
21:03 d0nkeyBOB joined #git
21:09 mischat joined #git
21:09 howitdo joined #git
21:10 finalbeta joined #git
21:11 synthroi_ joined #git
21:11 aard_ joined #git
21:11 venmx joined #git
21:13 fatalhalt joined #git
21:14 j416 PresidentElect: git-svn is not bad if you're stuck in svn world.
21:18 Vampire0 PresidentElect, getting Git was the best that could happen when stuck at companies that still insist on using SVN as VCS. I always since I know Git use its git-svn subcommands as SVN client, so I use almost the full power of Git on my local side and the others can continue using plain SVN if they prefer :-)
21:21 Es0teric joined #git
21:22 j416 ^ that
21:22 cagedwisdom joined #git
21:23 afuentes joined #git
21:23 Vortex35 joined #git
21:30 kraut joined #git
21:31 epist3me joined #git
21:35 SwiftMatt joined #git
21:39 venmx joined #git
21:40 alipoor90 joined #git
21:42 msonntag joined #git
21:44 nettoweb joined #git
21:44 m0viefreak joined #git
21:47 DocLivesey joined #git
21:47 countingdaisies joined #git
21:48 Gsham joined #git
21:51 alipoor90 Hi, I'm new to VCSs, I have repo where I make small changes in many files, and often my work in not done by the end of day and I want to save changes as a commit to ensure their integrity, or I want to make other changes but I want to have a backup of the current state (and e.g. 1h later have another backup and so on, not just a single backup), what feature of git should I use for this purpose? branches or git stash? or ...?
21:51 j416 alipoor90: commit
21:52 j416 alipoor90: then use for example rebase to redo that into useful logical commit(s)
21:52 Limes joined #git
21:52 llamapixel alipoor90: are you on your own local branch as well?
21:52 alipoor90 to make them add a single commit?
21:53 kadoban alipoor90: I commit probably once every 10 minutes when I'm generating content, at least. Git can't save you from losing work until you ... tell it about the work.
21:53 kadoban It should not be like an end-of-day thing.
21:53 alipoor90 for now I have a local repo which gets only updated by me, but I like to know about the right way of working with a remote repo, should I make a new local branch for my self when I'm working with remote repos?
21:53 llamapixel http://nvie.com/posts/a-succ​essful-git-branching-model/    ||    https://gist.github.com/djs​piewak/9f2f91085607a4859a66      alipoor90  a little bit of reading for two articles. in article two add the dmz before master
21:54 llamapixel I commit when I have an obvious solid change, refactor a few things, added a feature, purged files...
21:54 alipoor90 I wasn't aware that I can convert multiple commits into one
21:55 llamapixel git status will show you how many commits you are in front or behind in case that was not known.
21:55 kazantip joined #git
21:56 llamapixel It never hurts to have a MyGitTest project you can do crazy things into for experience as well.
21:57 WaReZ joined #git
21:58 llamapixel alipoor90:  If you grow to quite a few repos and working with people who need you to commit and push without the dmx concept, the can I go concept is great because it checks them all for you. https://github.com/stevenjack/cig
21:59 llamapixel dmz*
21:59 DolphinDream so again.. how do you compare two commits (one cherry pick of another + possibly some extra amends) to check if the sets of changes within those two commits are exactly the same ?
22:00 llamapixel mmm cherries
22:00 alipoor90 If I have a repo with these commits: A-B-C-D-E-F-G, and I make the B and C and D a single commit to make the repo look like this A-newD-E-F-G will it change the E and F and G SHAs? as whole which operations can change SHAs of other commits?
22:00 bremner DolphinDream: patch-id
22:00 bremner man git patch-id
22:00 gitinfo the git-patch-id manpage is available at http://jk.gs/git-patch-id.html
22:00 DolphinDream i see
22:01 texasmynsted say I have branch, branchA and it maps to a remote origin/branchA, and I branch it to local branch branchB.
22:01 GavinMagnus joined #git
22:01 rewt alipoor90, yes, the SHA1 of every commit is partly dependent on the SHA1 of its parents
22:01 GavinMagnus left #git
22:02 FSadino joined #git
22:03 alipoor90 Thanks
22:03 texasmynsted When remote branch origin/branchA updates I should be able to update branchB with "git pull" or "git pull —rebase" from the remote without separately updating the local branchA etc, then merging local branchA into local branchB.  RIght?
22:04 jasondockers kadoban, do you squash your history?
22:04 jasondockers err, commits
22:04 thebope joined #git
22:04 rewt texasmynsted, if branchB is only local, it won't change with "git pull"
22:05 kadoban Not usually. I cleanup stuff once in a while, if they're real shit. Otherwise I just merge --no-ff all the time and consider merged braches fairly "don't bother looking here usually" material
22:05 rewt btw "git pull" is basically just short for "git fetch; git merge"
22:05 texasmynsted ah, yes, you are correct.
22:05 kadoban I find the history useful occasionally, and not distracting otherwise.
22:05 texasmynsted Ok so I mean get merge
22:05 kadoban (almost every commit I ever make is on a feature branch)
22:06 texasmynsted So I should be able to merge with the remote branchA without fetching anything right?
22:06 rorro joined #git
22:06 morenoh149 joined #git
22:06 rewt if you git fetch without updating local branchA, and merge branchA -> branchB, then you'll merge that old state of branchA, not the most recent
22:06 morenoh149 how do I see changes that are staged?
22:06 jasondockers kadoban, makes sense
22:06 bremner morenoh149: git diff --cached
22:06 kadoban morenoh149: git diff --cached  (you'd be wise to add an alias for this, it's insanely useful)
22:07 texasmynsted for branchB, now I want to ignore that branchA exists locally.
22:07 texasmynsted I just want to update my local-only branchB directly from the remote version of branchA.
22:07 rivarun joined #git
22:08 rewt texasmynsted: checkout branchA; pull; checkout branchB; merge branchA
22:09 romerocesar joined #git
22:10 texasmynsted Why when I do not care about local branchA?
22:10 texasmynsted must I really do that?
22:11 tmsmith joined #git
22:11 kadoban texasmynsted: What do you actually want to do? I'm lost.
22:11 macivy joined #git
22:11 diogenese joined #git
22:11 rewt texasmynsted, i guess you can: checkout branchB; fetch; merge origin/branchA
22:12 watabou_ joined #git
22:12 rewt texasmynsted, but you'll have the branchA commits anyways, and branches are just pointers to commits, so not saving much by "not having local branchA"
22:13 rominronin joined #git
22:13 texasmynsted I am trying to do this update in as few steps as possible
22:13 texasmynsted fetch will fetch revisions for all branches right?
22:14 texasmynsted So I really do not need to co branchA.
22:14 rewt fetch will fetch commits/branches/tags that you don't have locally
22:14 llamapixel !fetch vs commit
22:14 gitinfo When you work with remote repositories, Git stores copies of the remote's branches in !tracking_branches (basically mirrors). You can use 'git fetch' to update those. If you want to actually apply changes from the remote to your checked out branch, a second step is needed, usually 'git merge' or 'git rebase'. There's also 'git pull' which combines both steps.
22:14 jimi_ joined #git
22:14 llamapixel sorry that was supposed to be fetch /pull
22:15 texasmynsted yeah
22:15 texasmynsted This is something that will run in a script so I want to eliminate steps that I would normally do manually
22:15 emg joined #git
22:15 texasmynsted so I can git fetch everything in one command
22:16 texasmynsted then I can merge the changes from origin/branchA to branchA w/o checking out branchA.  Then I an merge the changes from branchA to branchB.
22:16 rewt i tend to be more verbose in scripts vs manual, because it is scripted, so it will just do it all, and when looking at the script later it's more obvious what's being done
22:16 Sasazuka joined #git
22:16 texasmynsted I guess I am just saving two checkouts but that is two saved commands
22:17 jaguarmagenta joined #git
22:17 zacts joined #git
22:17 jeffreylevesque joined #git
22:18 jccn joined #git
22:18 Cavallari joined #git
22:21 JamesBaxter joined #git
22:24 emg joined #git
22:26 DocLivesey left #git
22:28 SwiftMatt joined #git
22:28 buffal0 joined #git
22:28 griffindy joined #git
22:29 llamapixel Get a git hub account , or gitlab and make a test repo then go crazy in there touching fred, sam, and joe files with red green and blue branches. Use another git hub / lab account and test it as if you are two devs.
22:29 llamapixel Nothing beats that aha test environment for speed.
22:34 rewt don't even need github/gitlab;  you can use a bunch of local repos
22:35 rewt all repos are equal as far as git is concerned, so having a "remote repo" point to a local directory is no different than having it point to somewhere in the cloud
22:35 Spec-Chum joined #git
22:39 chardan joined #git
22:45 countingdaisies joined #git
22:45 matthiaskrgr so, I have a repo that I deleted all the checked out files in
22:45 QuestionTime joined #git
22:45 osse git checkout -- . && echo yaaay
22:46 matthiaskrgr is there a way to do a  git checkout and a git pull in the same step so that I don't have to checkout all the files and then update them again because of the pull?
22:46 matthiaskrgr (didn't do git pull in a while)
22:47 osse not that i know of. but why? one huge repos checkout should only take a couple of seconds
22:47 Noodlewitt joined #git
22:48 mizu_no_oto joined #git
22:48 macivy joined #git
22:49 Poppa joined #git
22:51 tmsmith joined #git
22:52 corn13read joined #git
22:53 mattkrea joined #git
22:53 llamapixel You have a copy of the files locally, it is just updating the differences. Part of why distributed git is god
22:56 romerocesar_ joined #git
22:56 bremner no, clapton is god
22:56 llamapixel ^^
22:56 cdown_ joined #git
22:57 nohop joined #git
22:57 rwb joined #git
22:58 llamapixel https://youtu.be/idLyobOhtO4?t=384
22:58 osse not knopfler?
23:01 fmeerkoetter joined #git
23:01 MrEnergy joined #git
23:02 anonymuse joined #git
23:03 bremner well, not according to 1970s london graffiti
23:03 QuestionTime joined #git
23:04 mellernoia joined #git
23:04 Dougie187 left #git
23:04 Sasazuka joined #git
23:08 peeps[lappy] joined #git
23:10 mischat joined #git
23:10 hahuang65 joined #git
23:10 MrWoohoo joined #git
23:10 King_Hual` joined #git
23:11 QuestionTime joined #git
23:13 FSadino joined #git
23:13 FSadino Hello ppl
23:13 Wza joined #git
23:14 FSadino I'm getting a strange error while trying to use meld on mergetool
23:14 Sasazuka joined #git
23:14 FSadino It says meld need python 3.3 or up
23:15 FSadino Already update to 3.5 and change it to be used as default but the error continues...
23:15 FSadino Anyone can help?
23:15 FSadino Thanks in advance
23:16 Gsham joined #git
23:16 howitdo joined #git
23:16 howitdo joined #git
23:17 maroloccio joined #git
23:20 sofly joined #git
23:20 sofly joined #git
23:21 nettoweb joined #git
23:21 chromity joined #git
23:22 tmg joined #git
23:22 nd_ joined #git
23:23 FSadino joined #git
23:24 nanga joined #git
23:24 nanga joined #git
23:26 osse FSadino: does meld work from the command line directly?
23:28 FSadino osse: No, same error
23:29 Sasazuka joined #git
23:29 osse at least we can rule git out
23:29 roxlu joined #git
23:29 romerocesar joined #git
23:29 FSadino osse: didn't understand what you mean
23:30 osse FSadino: i mean git has nothing to do with it
23:30 FSadino No, got is not the problem. I can use kdiff3
23:30 FSadino But I prefer meld
23:31 FSadino *git
23:31 osse in that case maybe you should ask #python.  I at least have no idea how to debug it
23:33 gnoirzox joined #git
23:35 nicksloan joined #git
23:39 johnmilton joined #git
23:39 mikecmpbll joined #git
23:44 rominronin joined #git
23:46 ralph_ joined #git
23:48 FSadino osse: thanks, I will try on python channel
23:54 Sasazuka joined #git

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