Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-13

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

All times shown according to UTC.

Time Nick Message
00:00 canuk joined #git
00:14 Vampire0 gry, a branch is just a post-it note on a commit. A commit does not belong to a branch. It may be part of the history of the commit a branch pointer currently points at, but a commit can be part of any amount of branches, including none
00:18 Serus left #git
00:18 Vampire0 gry, and to pick the commit the branch pointer "vampire" currently points at, simply do `git cherry-pick vampire`
00:27 Derperpe1 joined #git
00:27 Nugget_ joined #git
00:29 clemf_ joined #git
00:29 ejnahc joined #git
00:30 olbat joined #git
00:34 pur3eval joined #git
00:37 yqt joined #git
00:41 jameser joined #git
00:45 flashpoint9 joined #git
00:46 om_henners joined #git
00:48 flashpoint9 Hey guys, had a question. I have a remote server that I would like to communicate with repos belonging to a group on github, I also want to push and pull to those repos locally. Im thinking about using deploy keys (not 100% sure) on the server so that I can push and pull from github while on the server and using the same SSH keys for local, is that the best/right way to handle what I want?
00:48 gry thanks Vampire0!
00:52 brent__ joined #git
00:54 yqt joined #git
00:59 Vampire0 gry yw
01:00 gitinfo flashpoint9: Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
01:00 matoro joined #git
01:02 flashpoint9 gitinfo: Ok, I wondered if I was asking in the wrong channel but thought I would give it a try since it's more of a methodology question (ie. what would you do in my situation)
01:02 watabou joined #git
01:02 peterR`` joined #git
01:03 brokensyntax joined #git
01:07 gry left #git
01:08 denimsoft joined #git
01:12 ozmage joined #git
01:14 CussBot joined #git
01:16 fatalhalt_ joined #git
01:18 shinnya joined #git
01:19 nikivi joined #git
01:19 __builtin joined #git
01:20 rbjorklin joined #git
01:20 cdown joined #git
01:21 iamtakingiteasy joined #git
01:21 netj joined #git
01:22 yqt joined #git
01:22 Saturn812 joined #git
01:22 linuxmodder joined #git
01:25 newbie joined #git
01:25 xlegoman joined #git
01:27 dsdeiz joined #git
01:30 akkad joined #git
01:30 mischat joined #git
01:32 cheater joined #git
01:32 cheater hi
01:33 cheater when specifying a revision for something like git diff, is there a way to say "diff between <rev0> and the nearest common ancestor of <rev1> and <rev2>"?
01:33 cheater or
01:33 cheater "diff between <rev1> and the nearest common ancestor of <rev1> and <rev2>"?
01:34 kyan joined #git
01:34 cheater i.e. i am on a branch and i would like to see the complete diff since i branched off from master
01:34 e yes
01:35 e look at ... (as opposed to ..) in git help diff
01:35 pur3eval joined #git
01:36 cqi joined #git
01:45 Levex joined #git
01:49 brent__ joined #git
01:50 gelei007 joined #git
01:52 chipotle joined #git
01:53 levex_ joined #git
01:53 fatalhalt__ joined #git
01:53 d1z joined #git
01:54 howitdo joined #git
01:54 howitdo joined #git
01:54 dwmw2_gone joined #git
01:56 MattMake_ joined #git
02:00 elsevero joined #git
02:01 acetakwas joined #git
02:04 sharkz joined #git
02:04 Vgr joined #git
02:04 Vgr joined #git
02:04 Wulf4 joined #git
02:05 ffilozov joined #git
02:06 geoid_ joined #git
02:09 Somelauw If one repo stores a file a and another repo stores a file subdir/subdir/subir/a, is it possible to cherry-pick from subdir/subdir/subdir/a to a or should I just manually copy the changes and give credit in the commit message?
02:11 sbulage joined #git
02:14 newbie1 joined #git
02:16 anuxivm left #git
02:17 finalbeta joined #git
02:17 dwmw2_gone joined #git
02:19 MattMaker joined #git
02:19 pks joined #git
02:23 armyriad joined #git
02:27 b3kN joined #git
02:28 nunchuck joined #git
02:30 deduped joined #git
02:31 dcy joined #git
02:33 Goplat joined #git
02:35 mischat joined #git
02:35 dreiss joined #git
02:35 pur3eval joined #git
02:37 akkad joined #git
02:39 nunchuck joined #git
02:46 mizu_no_oto joined #git
02:48 Vampire0_ joined #git
02:50 aavrug joined #git
02:55 d^sh joined #git
03:00 durham joined #git
03:02 ojdo joined #git
03:04 nckpz_ joined #git
03:04 zzz_ joined #git
03:05 SwiftMatt joined #git
03:08 raijin joined #git
03:09 dRealm joined #git
03:11 ToBeCloud joined #git
03:11 Nilesh_ joined #git
03:12 dRealm So here's what I've done:  I wanted to clean up my webpage by moving all images under the root of the site to '/assets/images/'
03:13 dRealm after doing that, I did a: git rm '*.jpg'
03:14 dRealm not knowing that '*' recurses into directories.
03:14 dRealm I have not committed my work yet
03:15 zivester joined #git
03:16 glspi joined #git
03:16 oaao joined #git
03:16 dRealm so.. what end up happening is git rm '*.jpg' deleted the images I just moved to '/assets/images' as well
03:17 Vortex34 joined #git
03:19 dRealm Good thing I did do a commit before I fucked up.
03:19 dRealm Good thing *is*
03:19 dRealm so, is "git reset" the command I want?
03:20 venmx joined #git
03:23 dRealm Okay, so it looks like git does have a record of all the deleted files.  But here's the message it printed after I typed "git reset"
03:23 dRealm http://codepad.org/hCLkY6Tn
03:25 hexagoxel joined #git
03:25 dRealm Come on boyz.  It's 10:25 EST, I know y'all still up.
03:26 fstd_ joined #git
03:26 chachasmooth joined #git
03:31 glspi drealm, i'm completely unqualified to help you....but i think maybe a 'git reset --hard' would do it....not my fault if not though!
03:31 durham joined #git
03:33 dRealm glspi: yay
03:34 dRealm glspi: it came back
03:34 glspi nice :)
03:36 pur3eval joined #git
03:36 mischat joined #git
03:38 dRealm I can't believe they (or is it Linus) made '*' recurse into directories.
03:40 diogenese joined #git
03:42 duderonomy joined #git
03:45 Limes joined #git
03:46 rgrinberg joined #git
03:46 jstimm joined #git
03:49 brent__ joined #git
03:49 BackEndCoder joined #git
03:53 svm_invictvs joined #git
04:00 raijin joined #git
04:02 inflames joined #git
04:03 sunri5e joined #git
04:03 jnewt1 joined #git
04:04 Andrew_K joined #git
04:05 jnewt1 i can't seem to clone anything using http or https , i get Unable to find remote helper for 'https'
04:05 jnewt1 .  i just updated curl and git based on some answers from SO.
04:05 dRealm Okay, I just read git-rm(1).  The answer is: if you want to unstage and delete stuff ONLY from the working directory, DON'T ask git to do the expansion; instead let the shell do it.
04:06 sarp joined #git
04:06 sarp_ joined #git
04:06 ozmage joined #git
04:07 jnewt1 here's the updated --version outputs from git and curl: http://pasted.co/1037e7a5
04:12 bumpy joined #git
04:13 qguv joined #git
04:15 qguv joined #git
04:18 mohabaks joined #git
04:19 shgysk8zer0_ joined #git
04:25 LiftLeft joined #git
04:28 webbcam joined #git
04:33 Kaisyu joined #git
04:34 Cabanoss- joined #git
04:36 mohabaks joined #git
04:36 VladGh joined #git
04:36 _xor joined #git
04:37 pur3eval joined #git
04:37 mischat joined #git
04:37 dcy joined #git
04:38 hexagoxel joined #git
04:38 fstd joined #git
04:39 Emperor_Earth joined #git
04:45 svm_invictvs joined #git
04:46 fstd joined #git
04:48 endiruna joined #git
04:51 matoro joined #git
04:52 xall joined #git
04:55 sword joined #git
04:56 sittingbear joined #git
05:01 ayogi joined #git
05:04 matoro joined #git
05:07 ElGrandeAmigo joined #git
05:11 zzz joined #git
05:12 jimklo joined #git
05:12 lmclinskey joined #git
05:17 ozmage joined #git
05:25 SiliconDon joined #git
05:25 Lunatrius joined #git
05:26 cheater e: thanks, let me look
05:27 cheater e: thanks, but that's not it
05:28 cheater e: oh but actually .. is what i'm looking for
05:29 cheater >> For example, origin.. is a shorthand for origin..HEAD and asks "What did I do since I forked from the origin branch?" Similarly, ..origin is a shorthand for HEAD..origin and asks "What did the origin do since I forked from them?"
05:29 SiliconDon joined #git
05:38 pur3eval joined #git
05:38 mischat joined #git
05:44 sarri joined #git
05:44 sarri joined #git
05:44 nd joined #git
05:45 sbulage joined #git
05:48 gelei007 joined #git
05:49 jameser joined #git
05:50 matoro joined #git
05:50 Groovin joined #git
05:53 mohabaks joined #git
06:01 fstd joined #git
06:02 dec0n joined #git
06:04 MattMaker joined #git
06:07 vivuroy joined #git
06:08 brent__ joined #git
06:08 MineCoins joined #git
06:08 MACscr joined #git
06:10 jozwior joined #git
06:16 rscata joined #git
06:21 mohabaks joined #git
06:23 Gloomy joined #git
06:36 Guest82 joined #git
06:37 Kulrak joined #git
06:37 Kulrak joined #git
06:38 pur3eval joined #git
06:39 mischat joined #git
06:41 dersand joined #git
06:44 _UniFreak joined #git
06:45 overlord_tm joined #git
06:50 Raging_Hog joined #git
06:50 MattMake_ joined #git
06:50 lordjancso joined #git
06:53 ThomasLocke joined #git
06:53 basiclaser joined #git
06:56 e01 joined #git
06:56 e01 joined #git
06:57 Endorphine joined #git
06:59 Endorphine left #git
07:01 zeroed joined #git
07:01 zeroed joined #git
07:01 wdfwefewvfgew joined #git
07:01 wdfwefewvfgew left #git
07:01 Endorphine joined #git
07:01 Endorphine left #git
07:02 miczac joined #git
07:02 JeroenT joined #git
07:04 vivuroy joined #git
07:04 Arno joined #git
07:05 ihradek joined #git
07:06 lmat joined #git
07:10 zeroed joined #git
07:10 zeroed joined #git
07:16 lb1c joined #git
07:18 afuentes joined #git
07:19 acetakwas joined #git
07:20 dcy joined #git
07:20 Lc0rE_ joined #git
07:20 dan2k3k4 joined #git
07:24 freimatz joined #git
07:24 chele joined #git
07:24 santagada joined #git
07:26 Lc0rE joined #git
07:33 JeroenT joined #git
07:37 jimklo joined #git
07:38 F0rTh3J3st_ joined #git
07:38 dcy joined #git
07:39 pur3eval joined #git
07:40 mda1 joined #git
07:43 mohabaks joined #git
07:43 bolino1234 joined #git
07:43 bolino1234 left #git
07:44 jimklo joined #git
07:45 JeroenT joined #git
07:46 jimklo joined #git
07:47 repozitor joined #git
07:50 jimklo joined #git
07:51 repozitor left #git
07:52 mohabaks joined #git
07:54 ash_workz joined #git
07:54 qt-x joined #git
07:57 sgfgdf left #git
07:57 jnavila joined #git
07:58 kent\n joined #git
08:02 mischat joined #git
08:03 blr joined #git
08:05 _ikke_ jnewt1: what does git --exec-path return?
08:05 JeroenT joined #git
08:06 dcy joined #git
08:11 visual joined #git
08:11 visual hey guys
08:11 ispn joined #git
08:11 visual how do i add a remote git repository to an existing folder
08:12 jagob joined #git
08:14 cqi joined #git
08:14 _ikke_ visual: git remote add <name> <url>
08:14 rajat joined #git
08:16 aidalgol joined #git
08:19 visual and then how do i 'sync' it?
08:19 visual i cant push, i cant pull
08:19 visual this is really frustrating
08:19 Prospero_ joined #git
08:20 Dumblez0r joined #git
08:20 visual Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g.
08:20 visual hint: 'git pull ...') before pushing again
08:20 visual but i *just* pulled it
08:20 _ikke_ You have to specify *what* to pull
08:20 theoceaniscool joined #git
08:20 AndChat|607476 joined #git
08:21 visual git pull remote origin
08:21 visual error: The following untracked working tree files would be overwritten by merge:
08:22 _ikke_ visual: did you call your remote 'remote'?
08:22 Prospero_ left #git
08:22 visual my bad, git pull origin master
08:22 _ikke_ ok
08:22 visual and i t complains about the files
08:22 Prospero_ joined #git
08:22 _ikke_ Right
08:22 _ikke_ You have untracked files
08:22 _ikke_ I mean
08:22 _ikke_ uncomitted changes
08:23 visual but i cant commit them because it says my branch is behind
08:23 _ikke_ You an alway commit
08:23 visual -f ?
08:23 _ikke_ No need to
08:23 _ikke_ just stage them and commit
08:23 visual i can't man
08:23 visual hint: Updates were rejected because the tip of your current branch is behind
08:23 visual failed to push some refs to..
08:23 visual so cant push and cant pull
08:23 _ikke_ That's when you *push* changes
08:23 visual what the hell
08:24 venmx joined #git
08:24 _ikke_ visual: You are missing one step
08:24 visual what step
08:24 _ikke_ visual: First make sure everything locally is comitted
08:24 Endorphine joined #git
08:24 visual nothing to commit, working directory clean
08:24 _ikke_ visual: What does git status return
08:24 AndChat-607476 joined #git
08:25 visual same thing, on branch master, nothing to commit, working directory clean
08:25 _ikke_ visual: git status --ignored
08:25 visual yeah there,s a bunch of ignored files
08:26 visual i added those to gitignore
08:26 _ikke_ Right
08:26 _ikke_ I suspect that someone started to track one of those files
08:26 visual nobody except me uses this repository, i made it yesterday
08:26 _ikke_ ok
08:26 _ikke_ and git merge origin/master
08:27 visual error: The following untracked working tree files would be overwritten by merge:
08:27 _ikke_ What is the name of that file
08:27 visual Sitemap.xml both fiels
08:27 _ikke_ (Is it one of the ignored files)?
08:27 visual no
08:27 visual or maybe
08:27 visual wait
08:28 visual http://prntscr.com/e82jve
08:28 visual i dont know where he gets the dev/tests... part
08:28 visual s/part/folders
08:29 _ikke_ visual: try git status --ignored -uall
08:29 _ikke_ It should also show each file seperately
08:29 visual it does, there's a lot of them
08:30 _ikke_ They are probably covered by your .gitignore file
08:30 visual yeah
08:31 _ikke_ Right, so you track them in your remote, but not locally
08:31 visual how?
08:31 _ikke_ The merge would have to overwrite the sitemap.xml, which git refuses
08:32 visual right so what's the procedure now? i guess i could just delete those files
08:32 _ikke_ Yeah, that's the easiest sollution
08:33 visual after i remove them what do i do
08:33 _ikke_ Then merge, then untrack those files
08:33 visual which git commands
08:33 AndChat607476 joined #git
08:33 _ikke_ git merge origin/master
08:33 morfin joined #git
08:33 morfin hello
08:34 dvdchr joined #git
08:34 _ng joined #git
08:34 dc5ala joined #git
08:34 morfin git stash contains some things which act as commits?
08:34 _ikke_ morfin: Yeah, git stash is implemented as a merged between 2 commits (so 3 commits in total)
08:35 _ikke_ a merge*
08:35 Endorphine joined #git
08:35 BackEndCoder joined #git
08:38 fragMental joined #git
08:39 sbulage joined #git
08:40 pur3eval joined #git
08:40 visual fuckin gchristr
08:41 visual removed the folder, gonna start again
08:41 _ikke_ ..
08:41 visual every time i get to deal with git i wanna kill somebody :^)
08:42 morfin he-he i had merge conflict when popped stash
08:42 visual yesterday i made the repo, pushed everything, made an archive that i downloaded here at work
08:42 visual why the fuck does it have to be so complicated to sync it if it's the same files
08:43 _ikke_ visual: git trying to protect you against loosing changes
08:43 _ikke_ that are not tracked
08:43 morfin he-he
08:43 byte512 joined #git
08:43 visual where did the changes come from if it's the same files i pushed yesterday and nobody touched it
08:44 visual retarded git
08:44 morfin you even can cherry-pick removed commit i think
08:45 qt-x visual: have you changed the history (rebase) ?
08:45 visual no i havent touched it at all
08:45 qt-x morfin: try reflog
08:46 _ikke_ visual: did you use git add -f sometime?
08:46 visual yes
08:46 _ikke_ Well, there you go
08:46 _ikke_ git add -f tells git to also add ignored files
08:47 visual what a retarded feature
08:47 visual i thought it just adds it despite conflicts
08:47 Balliad joined #git
08:48 morfin qt-x i remember
08:48 morfin something like git cherry-pick ..HEAD@{2}
08:49 morfin without knowing actual id of commit
08:49 MattMaker joined #git
08:51 jimklo joined #git
08:51 visual http://prntscr.com/e82sm0
08:51 visual fuck it
08:51 visual :^)
08:51 visual git pull
08:52 visual then git push and it says it contains work i do not have
08:52 visual if that's not retarded i dont know what is
08:52 _ikke_ visual: It's you trying random things without trying to grasp what is happening
08:52 _ikke_ especially adding random -f
08:52 morfin git pull failed?
08:52 visual >remote: GitLab: You are not allowed to force push code to a protected branch on this project
08:52 visual jesus fucking christ
08:52 visual i need a smoke
08:53 morfin because there is local uncommited changes
08:53 _ikke_ visual: It tells you why it failed
08:53 visual i JUST added . and commited it
08:53 morfin Gitlab can protect certain branches from push
08:53 morfin so you can only go trought merge request
08:54 morfin pull, create branch, commit, push, create merge request, merge
08:54 _ikke_ morfin: I don't think it's the case here
08:54 _ikke_ Problem is that his remote contains changes he pushed from another repo
08:55 _ikke_ he tries to merge locally, but that fails, because he has untracked files that would've been overwritten
08:55 _ikke_ And lastly, he uses push -f, overwriting the commits he pushed from the other branch
08:55 _ikke_ from the other repo*
08:57 MonsterKiller joined #git
08:57 visual well not exactly
08:58 visual i added some folders to gitignore because they're cache folders, etc
08:58 visual then pushed to the repo
08:58 visual now i downloaded the archive from the server (including the cached folders), added the same gitignore to the folder, and am trying to sync with the repo
08:58 visual and failing miserably :^)
08:59 Dumblez0r joined #git
08:59 _ikke_ Well, the files *are* tracked in master on your remote
08:59 joshszep joined #git
08:59 _ikke_ even if you have them in .gitignore
08:59 _ikke_ That's what causing these errors
08:59 visual only 2, out of a few hundred
08:59 visual why
09:00 visual *out of a few hundred that are ignored
09:00 _ikke_ visual: git add -f, files were already tracked before you ignored them
09:00 visual yeah and i did the -remove all from gitignore thing before pushing yesterday
09:01 visual which reflected in the repo as deletion of those files
09:01 visual fuck it, i'll just pull without the cached files
09:01 apotry joined #git
09:02 visual wasted 2 hours already on this, not worth it
09:02 visual git kills
09:02 visual thank you for your time :)
09:03 _ikke_ visual: It helps to invest into it a bit, so that you understand what happens. Is a lot less frustrating
09:03 visual honestly it's just easier to keep backups than use this piece of shit software
09:03 mohabaks joined #git
09:04 visual i've been a dev for a better part of a decade, and *every* *single* time git is involved it's a nightmare
09:05 _ikke_ visual: I was helping you trying to solve it, but you were too impatient
09:05 jimsio joined #git
09:05 visual i know, appreciate that
09:05 visual *sigh*
09:05 JeroenT joined #git
09:05 visual if you have the time, can you guide me through it again?
09:05 _ikke_ sure
09:05 visual ill give it one last shot
09:05 visual alright
09:07 visual im unpacking an archive taken from the hosting server; repo doesnt contain a few folders that i need ignored, which are added to the .gitignore
09:07 visual that's the situation
09:07 _ikke_ is that archive a full repo?
09:07 qt-x visual: git fetch; gitk --all ; # see what is wrong with your history
09:07 troulouliou_div2 joined #git
09:08 _ikke_ qt-x: this is a working tree issue, not necessarily a history issue
09:08 visual _ikke_: it contains all the files from the repo AND a few folders that need to be ignored
09:08 _ikke_ ok
09:08 mikecmpbll joined #git
09:08 _ikke_ visual: so now when you do git pull, you get that error message, right?
09:09 visual im still unpacking, 1 moment
09:09 visual well actully 2 minutes 20 seconds )
09:09 _ikke_ sure
09:09 visual i'll have to start with git init
09:09 qt-x :D
09:10 visual idk why but the .git folder didnt get archived
09:10 qt-x git init will create a new tree history
09:10 lss8 joined #git
09:10 lss8 joined #git
09:11 qt-x and all push will fail
09:11 _ikke_ right
09:11 visual well git clone will ignore those folders
09:11 dcy joined #git
09:11 visual so theres' no third option
09:11 _ikke_ visual: clone, and copy those folders?
09:11 visual it's a lot of folders
09:12 _ikke_ you can copy over the entire working tree
09:12 visual what if i copy everything [unpacked archive] on top of the cloned folder?
09:12 _ikke_ Right ^^
09:12 visual oh, ok, one moment
09:14 visual and then logically i should just add . and commit ?
09:15 visual the .gitignore should include the folders that are not to be tracked
09:18 jagob joined #git
09:20 Snugglebash joined #git
09:20 visual so after copying everything on top of the cloned folder, the next step is git add . ?
09:22 Shashikant86 joined #git
09:24 elsevero joined #git
09:24 blackwind_123 joined #git
09:26 vivuroy joined #git
09:27 visual :I
09:28 Lunatrius joined #git
09:30 Darcidride joined #git
09:33 mischat joined #git
09:34 Raging_Frog joined #git
09:37 HurricaneHarry joined #git
09:37 _ikke_ visual: what does git status say?
09:37 visual a lot of modified
09:38 visual even files that arent(and shouldnt be) in gitignore
09:38 visual i guess it looks by the date
09:39 _ikke_ Only to see if it should check for changes
09:39 _ikke_ if git status says modified, it means it has different contents
09:40 _ikke_ So I expect that what you have cloned is a different commit
09:40 _ikke_ visual: do you see ignored files in there?
09:40 sbulage joined #git
09:40 _ikke_ (files that should be ignored)
09:41 visual 1 moment
09:41 pur3eval joined #git
09:42 visual doesnt seem so
09:43 j7k6 joined #git
09:43 visual but im not 100%, the git status displayed more files than im able to scroll
09:44 achadwick joined #git
09:44 visual well what now? do i add them?
09:44 Shashikant86 joined #git
09:45 _ikke_ git ls-files -c -i --exclude-standard
09:45 _ikke_ this shows tracked files that would've been ignored
09:45 visual yes  the same 2 files from before, Sitemap.xml
09:45 Snugglebash joined #git
09:45 dsdeiz joined #git
09:45 dsdeiz joined #git
09:45 _ikke_ right
09:45 visual i should maybe write these commands somwhere too.. thx about that )
09:45 dcy joined #git
09:46 _ikke_ You only care about the cachefiles from the archive, correct?
09:46 mischat_ joined #git
09:46 Serpent7776 joined #git
09:46 visual yeah
09:47 hwoarang joined #git
09:47 _ikke_ git checkout HEAD .
09:48 _ikke_ (this would overwrite the 2 sitemap.xml files though)
09:48 visual alright did that
09:48 _ikke_ So now your working tree should be clean again
09:49 _ikke_ correct?
09:49 visual http://prntscr.com/e83fj8
09:49 visual i dont think so
09:49 visual i mean it stil shows in the --exclude-standard c
09:50 _ikke_ Yeah, that is the next step
09:50 acetakwas joined #git
09:50 _ikke_ git rm --cached <sitemap_files>
09:51 visual alright done
09:51 _ikke_ Now you can commit these changes
09:51 visual do i do add . first?
09:51 _ikke_ No, that's not necessary. Check git status
09:52 visual http://prntscr.com/e83gqa
09:52 visual weird, why does it not show all the modified files from before?
09:53 dcy joined #git
09:53 visual wew, the push went through
09:53 visual thanks a lot man, appreciate it :^)
09:53 visual now 2 more repos to go, hopefully the same commands will suffice
09:54 _ikke_ visual: that's what the git checkout HEAD . command did
09:55 King_Hual joined #git
09:55 ocbtec joined #git
09:55 visual i see
09:55 visual thank you
09:56 visual what would one need to do in this situation?
09:56 visual http://prntscr.com/e83iag
09:56 visual it complains that they're untracked, but i cant remove them
09:56 _ikke_ They are already untracked
09:56 _ikke_ you cannot 'untrack' them if they're not being tracked in the first place
09:56 _ikke_ if you want them gone, just rm them
09:56 _ikke_ (or add them to .gitignore)
09:57 visual got it, thanks man
09:58 denisMone joined #git
09:58 borkr joined #git
09:59 marcogmonteiro joined #git
09:59 visual *sigh*
10:00 visual in another repo, doing git checkout HEAD . outputs error
10:00 visual error: pathspec '.' did not match any file(s) known to git.
10:00 hussam joined #git
10:00 MattMaker joined #git
10:00 visual my bad, wrong folder
10:01 mquin_ joined #git
10:03 Shashikant86 joined #git
10:04 Tobbi joined #git
10:04 m4sk1n joined #git
10:05 askb joined #git
10:06 IntruderSRB joined #git
10:06 jozwior joined #git
10:07 nettoweb joined #git
10:12 mquin_ joined #git
10:13 rnsanchez joined #git
10:14 inbx joined #git
10:14 chll_ joined #git
10:14 TomyLobo joined #git
10:15 elsevero_ joined #git
10:16 bongjovi joined #git
10:17 ruxu joined #git
10:19 Tobbi joined #git
10:25 venmx joined #git
10:28 Gloomy joined #git
10:33 dcy joined #git
10:33 mischat joined #git
10:34 Snugglebash joined #git
10:35 Anticom joined #git
10:36 gelei007 joined #git
10:39 flaviodesousa joined #git
10:40 tvw joined #git
10:40 dwts joined #git
10:40 BooK joined #git
10:40 IntruderSRB joined #git
10:41 inbx joined #git
10:41 vivuroy joined #git
10:41 pur3eval joined #git
10:43 mehola joined #git
10:43 Derperpe1 joined #git
10:45 mehola joined #git
10:47 johnny56_ joined #git
10:49 Spherical joined #git
10:53 vivuroy joined #git
10:53 zeroed joined #git
10:58 vivuroy joined #git
10:59 ozmage joined #git
11:01 ferr1 joined #git
11:01 newbie1 joined #git
11:01 geoid_ joined #git
11:02 tvw joined #git
11:03 bvtton joined #git
11:11 kent\n joined #git
11:12 _cyril_ joined #git
11:12 IntruderSRB joined #git
11:13 Gravious joined #git
11:17 jfr joined #git
11:17 miczac\away joined #git
11:18 inbx joined #git
11:25 jnewt1 joined #git
11:26 venmx joined #git
11:27 mohabaks joined #git
11:33 redeemed joined #git
11:34 IntruderSRB joined #git
11:36 finalbeta joined #git
11:36 re1 joined #git
11:37 Snugglebash joined #git
11:37 re1 joined #git
11:38 wrouesnel1 joined #git
11:38 freimatz joined #git
11:38 re1 joined #git
11:40 mischat_ joined #git
11:40 re1 joined #git
11:41 re1 joined #git
11:42 re1 joined #git
11:42 pur3eval joined #git
11:44 re1 joined #git
11:45 cebor joined #git
11:46 MattMaker joined #git
11:47 PioneerAxon joined #git
11:49 blackwind_123 joined #git
11:51 Dumblez0r joined #git
11:52 LBV_User joined #git
11:53 Rico joined #git
11:53 Rico hi
11:53 _ikke_ hello
11:54 Rico wan anybody tell me the way to create a repository from a "git clone" directory backup ?
11:54 Rico s/wan/can/
11:54 ertesx joined #git
11:54 NullableTruth joined #git
11:55 _ikke_ if you have the .git directory, you already have a complete repository
11:55 dsdeiz joined #git
11:55 dsdeiz joined #git
11:56 gelei007 joined #git
11:57 Rico _ikke_:  yes I have it. I've done a "git init --bare repo.git" in my /home/git folder (that's where my git repos are). then I cd in my local copy and do a "git push git@127.0.0.1:repo.git"
11:57 Rico is that the correct way to do it ?
11:58 _ikke_ Not understanding what you want to achieve with that
11:58 Rico oops, did not see that it's lunch time, I'll be back in 1 hour
11:58 Rico sorry
11:58 BSAlb joined #git
12:00 Tobbi joined #git
12:01 swalladge joined #git
12:04 raijin joined #git
12:07 mischat joined #git
12:07 ferr1 joined #git
12:07 mischat joined #git
12:08 Orbitrix joined #git
12:09 deinspan- joined #git
12:12 JeroenT joined #git
12:13 Gloomy joined #git
12:15 deinspan- Hey folks, could someone help me figure out something I'm doing wrong please?  I have a clone of a project begriffs/postgrest. Some time ago I made a pull request for it in a branch named feature/stack-docker-build. I want to update and rebase that patch.
12:15 deinspan- my problem is, I left my local clone of it with some trash so I did a "git reset —hard deinspanjer feature/stack-docker-build" and that looks fine. "git status" says it is clean and up to date.
12:15 deinspan- next I try to do a "git pull origin master", and it does a rewind and replay, but that leaves me in an unusual state.
12:15 sophiag joined #git
12:15 deinspan- after the pull of master, "git status" reports that my branch and deinspanjer/feature/stack-docker-build have diverged.  How could they have diverged?
12:16 sophiag hi. on here as usual because i did something weird and am freaking out over a lost file :(
12:17 sophiag my situation is i seem to have too instances of git...one in the outer project folder and one in an inner src directory
12:17 JeroenT joined #git
12:17 sophiag i tried committing and pushing my change and it overwrote *everything* except what was in the inner src directory
12:18 sophiag so i did a hard reset back one commit and pushed that
12:18 JeroenT joined #git
12:18 YuGiOhJCJ joined #git
12:18 sophiag now the file in question is back to some really *really* old version
12:18 sophiag reflog obviously allows me to see everything, but i can't seem to be able to just open the version i saved by resetting it back
12:18 sophiag can anyone help me troubleshoot this?
12:21 sophiag the outer instance of git is clearly the correct one
12:21 sophiag i think i just need to figure out how to pull the file i saved this morning from the inner instance from the commit i see in reflog and can't seem to figure out how to do that :(
12:22 theoceaniscool joined #git
12:22 deinspan- @sophiag did you try diffing or reseting that file when you were in the directory where your nested .git exists?
12:23 sophiag yes
12:23 deinspan- @sophiag when you end up with nested .git folders, the git commands use the first one they find starting at the current working directory and going up.
12:23 sophiag the problem seems to be i did a hard reset in the nested .git and htat brought it way back several months
12:23 deinspan- oh, so the nested one is the old one?
12:23 sophiag yes
12:24 treia joined #git
12:24 deinspan- hmm
12:24 sophiag except that was where i committed the file i'm trying to recover
12:24 deinspan- and before the reset, had you ever done a commit of the file?
12:24 sophiag no
12:24 deinspan- hmm
12:25 sophiag what's confusing me is why i can't just reset the inner .git to after i committed that file and copy it
12:25 sophiag right now the outer one is correct except for that file...which is very very old
12:25 deinspan- wait, but you just said you hadn't committed it
12:26 sophiag you asked if i reset it
12:26 tsdev joined #git
12:26 deinspan- okay, let me ask something different..  are there *any* changes you made to that file that would be lost if you just blew everything away and worked with only the repo that is in the outer .git?
12:26 sophiag yes
12:26 sophiag that's my problem
12:27 deinspan- okay.
12:27 sophiag and right now i have the outer git pushed to remote and it's displaying the super old version of that one file
12:27 sophiag what i need is to just recover it from the inner .git
12:27 sophiag then copy it and commit to the outer one
12:27 alexandre9099 joined #git
12:27 deinspan- so at some point, you made changes to the file, you committed those changes to the inner .git repo, and then you did a reset of the inner .git, right?
12:27 sophiag yes
12:27 sophiag but i can see everything in reflog obviously
12:28 deinspan- what does "git fsck —lost-found" tell you?
12:28 sophiag in the inner one?
12:28 deinspan- yes
12:28 sophiag i have three dangling blobs
12:28 deinspan- we need to deal exclusively in the inner one until we get that file back since the outer doesn't have the changes you need
12:28 sophiag yes
12:29 deinspan- how far back did you reset? multiple commits or just one?
12:29 sophiag just one
12:29 sophiag but then tried resetting it forward once as well
12:29 deinspan- ew
12:29 deinspan- so can you see the SHA1 of the commit you want in "git reflog"?
12:29 sophiag yeah...from my bad troubleshooting the commit i actually need is 3 right now
12:30 sophiag the one i need is HEAD@{3}
12:30 sophiag for that one file
12:30 JeroenT joined #git
12:30 waveclaw joined #git
12:30 deinspan- okay, so try "git merge <SHA1>" of head 3
12:30 sophiag but i already tried resetting to that
12:30 sophiag and that screwed it up wrose
12:30 sophiag oh ok
12:30 sophiag lemme see
12:30 eroux joined #git
12:31 jab416171 joined #git
12:31 sophiag it says already up to date...
12:31 _ikke_ ls
12:32 sophiag i did ls and cat and it's the super old file tho...
12:32 deinspan- hmm.. so either the second reset you did put you in a state I don't understand, or the SHA1 you used is actually the old version...
12:32 deinspan- try deleting the file and then doing the merge again?
12:33 sophiag already up to date...
12:33 ChiLL_SurF joined #git
12:33 netj joined #git
12:34 sophiag altho now the file is gone
12:34 sophiag don't i need to commit after merging
12:34 sophiag ?
12:34 l4v2 joined #git
12:34 sophiag like i deleted it, merged again, now it's still gone
12:34 deinspan- after the merge, you should have the file in your current working state which is all you need
12:34 deinspan- okay, try doing just a checkout of that SHA1 instead
12:35 sophiag :D
12:35 deinspan- good
12:35 deinspan- So are you sure this is the only file you care about from this inner .git?
12:36 nowhereman joined #git
12:36 deinspan- And your team isn't doing anything with git subtrees or git submodules?
12:36 sophiag yes. if i could just swap this with the one that's currently in my remote i'd be golden
12:36 JeroenT joined #git
12:37 sophiag altho i have a ton of old formerly deleted junk in that folder too
12:37 deinspan- If yes to the second question as well, then what I would recommend is doing a mv of that inner .git to some safe out of the way place just in case
12:37 deinspan- when the inner .git isn't there any more, the outer one will be in charge again
12:38 deinspan- as soon as the inner is gone, you should be able to do a git status and see that one file is waiting for an add
12:38 eroux joined #git
12:38 sophiag hmmm
12:38 sophiag ok. i copied it to a gist anyway to be safe
12:38 deinspan- of course. :)
12:39 l4v2 left #git
12:40 sophiag ok moved it
12:40 sophiag and status in the right one has it waiting for me
12:40 deinspanjer and git diff still shows it being the changes you want?
12:40 JeroenT joined #git
12:41 sophiag yes
12:41 deinspanjer then commit that and you should be good to go.  If everything continues to look good after a while, you can throw away that spurious .git folder.
12:41 sophiag but i should probably roll back one commit in the outer git?
12:41 deinspanjer ah
12:41 sophiag there was one stupid one made
12:41 deinspanjer So in this git, you have a commit of the old version?
12:41 sophiag yes
12:42 sophiag i think i should reset back one and manually copy it?
12:42 deinspanjer one sec
12:42 deinspanjer have you pushed that change?
12:42 deinspanjer the one with the bad version?
12:42 sophiag yes
12:42 deinspanjer hum
12:43 sophiag i think best to act like i never edited the file and then paste it in
12:43 deinspanjer so a revert is basically just a new commit of an older version with a fancy message.
12:43 sophiag frankly
12:43 pur3eval joined #git
12:43 sophiag yup
12:43 deinspanjer since you pushed, that bad commit will still be in people's history
12:43 sophiag but really really old
12:43 sophiag people is just me
12:43 deinspanjer So I'd just commit the new version with the same explanatory message
12:44 sophiag yeah you're right
12:44 Derperpe1 joined #git
12:44 sophiag btw the shitty old files are there
12:44 sophiag just untracked
12:44 sophiag i suppose i can rm them
12:44 deinspanjer If you hadn't pushed, then you could do a git commit —amend instead, but oh well. :)
12:45 deinspanjer after you commit that important file, you can just do a git clean -fd
12:45 visual left #git
12:47 vivuroy joined #git
12:47 salamanderrake joined #git
12:47 F0rTh3J3st joined #git
12:48 mischat joined #git
12:48 deinspanjer Now then.. back to my problem I have to figure out. :)
12:49 sophiag haha
12:49 sophiag thanks so much
12:49 sophiag tbh i only come on this channel in panic mode
12:49 deinspanjer Very happy to pay it forward.
12:49 deinspanjer Same here.
12:49 sophiag i should try to learn more and then come here and help out
12:49 deinspanjer well, right now I'm not panicing, just annoyed
12:50 deinspanjer stackoverflow is a goldmine for learning the inner mysteries of git
12:50 JeroenT joined #git
12:51 mischat joined #git
12:53 sophiag i always feel like i know it until things go wrong :/
12:54 tobiasvl you'll get the hang of it
12:54 sophiag mainly i did stupid things when i started out that carried over
12:54 sophiag like moving directories the wrong way
12:54 sophiag that's a huge one
12:54 al-damiri joined #git
12:55 Rr4sT joined #git
12:58 Somelauw joined #git
12:58 str_ joined #git
12:59 Rico _ikke_:  hi again
12:59 Somelauw Am I bit disoriented by rebasing. When in an interactive rebase, does head refer to the commit I'm editing or the HEAD of not rebasing?
12:59 str joined #git
12:59 _ikke_ Somelauw: You mean in case of a merge conflict?
13:00 Somelauw no, if just doing 'edit'
13:00 _ikke_ HEAD is then the commit you want to edit
13:00 Somelauw then i don't know where i am, because git log shows the full tree of commits
13:01 inbx joined #git
13:01 Somelauw even though i thought i would be editing an old one
13:01 plos joined #git
13:02 netj joined #git
13:03 Rico somebody  sent me a .tgz containing a local copy of a git repo. I need to create a repo from this tgz. I have "git push" to an empty repository (created with git init --bare). when I wan to clone this repo, I have the following error :
13:03 Rico warning: remote HEAD refers to nonexistent ref, unable to checkout.
13:03 Somelauw okay, i'll abort the rebase and start again. I want to edit commit C, so I start by doing git rebase -i C; then replacing the line by 'edit'
13:04 Somelauw then when i press git lg, I see my full commit history
13:06 tobiasvl Rico: if the .tgz contains a git repo, why do you need to create a repo from it?
13:06 Somelauw okay, i now understand i should have done "git rebase -i C~", so the ~ is important
13:07 JeroenT joined #git
13:07 Rico tobiasvl:  because I need to work on this repository, apply bundles to it, create diffs, keep an history, ...
13:07 tobiasvl Somelauw: yes, you want to rebase ONTO the base, which is C~ (the parent of C)
13:07 tobiasvl Rico: I still don't understand. if the .tgz file contains a git repo, you can do all of that without creating a new repo.
13:08 Rico other people have to work on this copy and get copies of that
13:09 Wind0r joined #git
13:09 Rico tobiasvl:  is this the right way ? http://fpaste.scsys.co.uk/551998
13:11 cousteau joined #git
13:11 JeroenT joined #git
13:11 tobiasvl Rico: that looks OK, but the only branch you pushed to git@127.0.0.1:asterisk-ambe-full.git was 13.9.1-ambe-edmr? is HEAD supposed to be that?
13:11 Rico tobiasvl:  yes
13:12 Rico I think I'm missing a step
13:12 cousteau a branch is just a pointer (head) in the commit tree, right?  Not quite like a physical tree branch (i.e. a *set* of commits made while on a certain branch)
13:12 tobiasvl Rico: run "git symbolic-ref HEAD refs/head/13.9.1-ambe-edmr" inside asterisk-ambe-full.git
13:13 selckin !compsci
13:13 cousteau or do commits "know" which branch they belong?
13:13 tobiasvl cousteau: correct, a branch is a pointer to a ref. it's not a physical tree branch in itself, but by traversing the ref's parents it kind of is one
13:13 selckin cousteau: !cs
13:13 gitinfo cousteau: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/g​it-for-computer-scientists/ See also !concepts !bottomup
13:13 _ikke_ cousteau: nope
13:13 Rico tobiasvl:  in the "git clone" copy (/usr/local/src/...à ?
13:13 _ikke_ cousteau: a commit can be seen from numerous branches
13:13 cousteau I see
13:13 cousteau thanks!
13:13 ash_workz joined #git
13:13 cousteau (I'm no computer scientist but thanks for the link)
13:14 GodGinrai joined #git
13:14 _ikke_ cousteau: You don't really need to be one
13:14 tobiasvl Rico: no, in /home/git/asterisk-ambe-full.git
13:14 Rico ok
13:14 cousteau (well, I'm the kind of non-computer scientist who may get scared by words like "Directed Acyclic Graph"...)
13:14 _ikke_ Sounds more complicated than it really is
13:14 cousteau ok if "Directed Acyclic Graph" is the strongest word I'm going to find then ok
13:15 e it doesn't sound complicated
13:15 cousteau I mean, I know what that is
13:15 Somelauw tobiasvl: thanks, do professional git users rebase their commits all the time or do they just let them be?
13:15 _ikke_ commits are nodes on a graph
13:15 Rico tobiasvl:  still have the same warning, and onli have '.git' folder after cloning
13:15 codedmart joined #git
13:15 _ikke_ the edges are the references to the parent(s) of commits
13:16 e anyway, the point i suppose is that there is a set of commits, but it depends only on where the branch points
13:16 e commits don't know which branch they "belong to"
13:16 e Somelauw: it varies. i rebase all the time
13:16 * cousteau tries to read § "Storage" and gets discomforted by the UML-like charts... let's see if § "History" is friendlier
13:16 e some people hate merge commits (which are the alternative, generally speaking) and some people for some reason really like them
13:16 tobiasvl Rico: what does "git rev-parse HEAD" say inside the bare repo?
13:17 gpkfr joined #git
13:17 cousteau e: thanks, I somehow was expecting that when I made the branch "change this", it'd somewhat be a "group of related commits"
13:17 Rico tobiasvl:  http://fpaste.scsys.co.uk/551999
13:19 tobiasvl Rico: that doesn't seem right. that's, like, an infinite loop. what about "git rev-prase 13.9.1-ambe-edmr"
13:19 Rico d0fa05b9e0af303c94b9064da0782a6932d4bcac
13:20 Rico tobiasvl:  ^
13:20 tobiasvl Rico: oof, sorry. "git symbolic-ref HEAD refs/heads/13.9.1-ambe-edmr"
13:21 tobiasvl should work. I had refs/head instead of refs/heads.
13:21 CheckDavid joined #git
13:21 cousteau I had seen git tree charts that used different colors for different ramifications.  I thought that represented different branches, but I guess that was actually different authors.
13:22 e you can visualise a concept a bit like branches
13:22 Rico tobiasvl:  thank you ! can you explain me what was wrong / what I did wrong ?
13:22 jameser joined #git
13:25 tobiasvl Rico: by default, HEAD points to master, at least it seems like it from man git-symbolic-ref. you do not have a master branch, so you had to tell git that you had your own, non-standard default branch
13:25 gitinfo Rico: the git-symbolic-ref manpage is available at http://jk.gs/git-symbolic-ref.html
13:25 Gloomy joined #git
13:26 Rico tobiasvl:  so a "git clone git@127.0.0.1/repo -b 13.9.1-ambe-edmr" would have work ?
13:26 mozzarel1 joined #git
13:26 Rico (not sure about the "would have work" ...)
13:27 puff` joined #git
13:28 tobiasvl Rico: that would probably have worked (but is cumbersome to do every time someone wants to clone)
13:28 venmx joined #git
13:28 Rico ok
13:28 Rico thank you
13:28 ronskisika joined #git
13:29 jtfidje joined #git
13:29 boshhead_ joined #git
13:30 tanuki_ joined #git
13:30 Jan- joined #git
13:30 BinGOs_ joined #git
13:30 Renter_ joined #git
13:30 milki_ joined #git
13:30 hegge joined #git
13:30 vals_ joined #git
13:30 arand_ joined #git
13:30 gusnan_ joined #git
13:30 maxb_ joined #git
13:30 timewalk1r joined #git
13:30 GodGinra1 joined #git
13:30 RichiH_ joined #git
13:30 jj-_ joined #git
13:30 Ariadeno joined #git
13:30 Ramen_ joined #git
13:30 DistantS1ar joined #git
13:30 Gaga joined #git
13:30 CEnnis91 joined #git
13:31 ec\_ joined #git
13:31 tier2villain_ joined #git
13:31 INSANU_ joined #git
13:31 tazle__ joined #git
13:31 KMaia2 joined #git
13:31 mikap joined #git
13:31 chll__ joined #git
13:31 beuker_ joined #git
13:31 timewalk1r joined #git
13:32 GT4066 joined #git
13:32 timewalk1r joined #git
13:32 imMute joined #git
13:32 arunpyasi joined #git
13:32 ajpiano_ joined #git
13:32 imMute joined #git
13:32 PasiFist_ joined #git
13:32 hide joined #git
13:32 parasite_ joined #git
13:32 ollien joined #git
13:32 Jupelius_ joined #git
13:32 ngladitz joined #git
13:32 ngladitz joined #git
13:32 Karazhan joined #git
13:32 cwillu_at_work joined #git
13:32 madknight joined #git
13:33 rt joined #git
13:33 Snugglebash joined #git
13:34 ddavidd joined #git
13:34 jeffreylevesque joined #git
13:34 JeroenT joined #git
13:35 Perspicaciosity joined #git
13:35 tonyj joined #git
13:36 ismithers joined #git
13:36 Ranhir joined #git
13:37 esc joined #git
13:37 rajat joined #git
13:38 marcogmonteiro joined #git
13:41 Impaloo joined #git
13:42 SCHAAP137 joined #git
13:44 pur3eval joined #git
13:45 vivuroy joined #git
13:47 MattMaker joined #git
13:49 BinGOs_ left #git
13:49 timewalker joined #git
13:50 BinGOs joined #git
13:51 IntruderSRB joined #git
13:54 jfr joined #git
13:55 dikiaap left #git
13:55 mizu_no_oto joined #git
13:57 skered joined #git
14:00 vivuroy joined #git
14:00 alexandre9099 joined #git
14:01 BSab joined #git
14:01 algun_ joined #git
14:02 _xor joined #git
14:02 finalbeta joined #git
14:02 theoceaniscool joined #git
14:03 nickabbey joined #git
14:03 BSab joined #git
14:04 Eryn_1983_FL joined #git
14:05 Joel joined #git
14:05 Joel does anyone know of/have a link to/thoughts on - how to handle a change log in git? it's like a non stop conflict factory
14:06 cdg joined #git
14:06 raijin joined #git
14:06 averell joined #git
14:07 plasticle joined #git
14:07 cdg joined #git
14:07 masuberu joined #git
14:08 tsdev joined #git
14:08 Taikibansei joined #git
14:08 ubuntu joined #git
14:08 cdg joined #git
14:08 gpkfr joined #git
14:09 jameser_ joined #git
14:15 qqx joined #git
14:17 xall joined #git
14:18 raijin joined #git
14:20 WayToDoor joined #git
14:20 ikelso joined #git
14:20 INSANU_ left #git
14:20 Snugglebash joined #git
14:21 cdg joined #git
14:21 raijin joined #git
14:22 cdg_ joined #git
14:22 ddavidd joined #git
14:22 ddavidd joined #git
14:22 raijin joined #git
14:23 raijin joined #git
14:23 basdb joined #git
14:25 ShekharReddy joined #git
14:26 reliability joined #git
14:26 raijin joined #git
14:27 cdg joined #git
14:27 HedgeMage Joel: Most of my projects do the Changelog at release time, rather than per commit, and generate it from commit messages between that release and the previous (with a chance for human to edit)
14:28 cdg_ joined #git
14:28 HedgeMage Joel: Of course, this means that if your team writes shitty commit messages, you have to cane them until they cooperate.
14:28 venmx joined #git
14:29 mischat_ joined #git
14:29 skered When merging from another branch that has N number of commits does git rollup all those commits on the merge or would you see N number of extra commits when looking at the log?
14:30 _ikke_ skered: git just creates a new commit tying both branches together
14:30 Joel HedgeMage, either way you have to deal with shitty commit messages :)
14:30 mischat_ joined #git
14:30 raijin joined #git
14:31 Joel generating was what I was looking at, wasn't sure if there some magical other way people have come up with
14:33 sbeller joined #git
14:33 raijin joined #git
14:34 HedgeMage Joel: Other projects I've been on have tried other methods, but nothing that's excited me, especially since you always end up having to human-edit before release anyhow: the important bit is not missing anything you might want to include or should be telling users about.
14:34 chipotle joined #git
14:34 mischat joined #git
14:35 Wulf joined #git
14:35 Joel HedgeMage, Yeah, I have a group of dev's who don't understand the difference between an internal changelog, and an external changelog. They scream against automating it, but it doesn't go public. I think public facing should be made by hand off of tickets. They also want one entry per commit, which is funny, because git already has a pretty list...
14:36 * HedgeMage facepalms.
14:36 gpkfr joined #git
14:36 HedgeMage Your internal changelog should be "git log" ....if that isn't working for you, your devteam needs training in how to handle commit messages.
14:36 ResidentBiscuit joined #git
14:36 Joel "Yeah but people don't write good commit messages!" - and you think they will do a better job when they duplicate it into a changelog?
14:37 HedgeMage So, this is where I say something horrible and politically incorrect and mean.
14:37 Murr joined #git
14:37 wrouesnel1 joined #git
14:37 _ikke_ HedgeMage: Usually a commit log is a bit higher level than each commit message
14:37 Joel what's a commit log?
14:38 Joel ^not a troll question, seriously, do you mean change log?
14:38 _ikke_ yes. I meant a change log
14:38 Joel _ikke_, when externally facing, I agree, an internal log for other dev's to follow though?
14:38 Joel I think for higher level that's why you include an issue #.
14:39 HedgeMage When the lead dev and/or software security lead (my usual roles) is a cute but slightly scary 34yo female hacker with a tendency to thwart people with things like pre-receive hooks that reject commits that are >10% profanity, or >5% punctuation, or < 3 words... people tend to behave eventually.
14:39 raijin joined #git
14:39 thethorongil joined #git
14:40 HedgeMage "this commit is not tagged as a security patch and lacks a reference to our public issue tracker, cannot accept"
14:40 armyriad joined #git
14:40 _ikke_ Well, the log is as usefull as its commit messages
14:41 HedgeMage Joel: If you can train them to write in the changelog like grownups, you can train them to write commit messages like grownups.
14:41 Derperpe1 joined #git
14:41 HedgeMage Starting by showing them that you are reducing their workload through automation is a good thing.
14:41 reliability Hi. Why does git-flow suggest deleting release branches? What about fixes that need to be backported to older releases?
14:42 nettoweb1 joined #git
14:42 IntruderSRB joined #git
14:42 _ikke_ reliability: That's what you have tags for
14:42 Gsham joined #git
14:42 thorongil joined #git
14:42 _ikke_ You can just create a new branch starting from a specific tag
14:43 Joel people can put crap onto a branch that's never been released
14:43 Joel another good reason to use tags
14:43 _ikke_ right
14:44 _ikke_ That's why I never understood svn's tag model
14:44 elsevero_ joined #git
14:44 F0rTh3J3st_ joined #git
14:44 Murrito joined #git
14:44 tsdev_ joined #git
14:44 pur3eval joined #git
14:45 JanC_ joined #git
14:45 marcogmonteiro joined #git
14:45 reliability _ikke_, Joel: true, thanks for your answers.
14:45 mikecmpb_ joined #git
14:45 canuk joined #git
14:46 eroux joined #git
14:46 ugglan joined #git
14:46 Tanfrieze joined #git
14:48 SporkWitch joined #git
14:48 nikivi joined #git
14:48 MuffinMedic joined #git
14:48 daynaskully joined #git
14:50 mizu_no_oto joined #git
14:50 cdown joined #git
14:50 reynierpm joined #git
14:51 reynierpm hi there, let's suppose I am on a branch "branch1" and I want to checkout a file from "branch2" the right way to do it is git checkout branch2 path/to/file.ext, if I want to checkout all the file under /path/to the right command should be git checkout branch2 path/to/* ??
14:53 shinnya joined #git
14:53 jimi_ joined #git
14:53 _ikke_ reynierpm: no need for an asterisk
14:54 reynierpm _ikke_, good thx
14:54 _ikke_ reynierpm: checking out a directory equals to checking out all the files in there (recursively)
14:54 dcy joined #git
14:54 Dougie187 joined #git
14:57 Gloomy joined #git
14:57 rgrinberg joined #git
14:58 Intruder_ joined #git
14:58 reynierpm _ikke_, ummm I am doing something wrong: `git checkout esd /application/views/scripts/company/` ==> "fatal: ambiguous argument 'esd': both revision and filename Use '--' to separate paths from revisions"
14:59 _ikke_ git checkout esd -- /application/..
14:59 reynierpm _ikke_, is complaining about the path it says doesn't exists how do I find the right path?
15:00 mischat_ joined #git
15:00 _ikke_ reynierpm: git ls-tree -r esd
15:00 mohabaks joined #git
15:00 skered joined #git
15:00 ocbtec joined #git
15:01 noecc joined #git
15:01 mischat_ joined #git
15:01 uwe joined #git
15:01 e14 joined #git
15:03 reynierpm _ikke_, thx it works
15:03 uwe greetings, I'm seeking advise on getting code that has not been maintained in git in sync with a vanilla version of that software (roundcube) ... my question is very generic, and maybe this is the wrong place to ask, so please enlighten me
15:06 miczac\away joined #git
15:07 btyne79 joined #git
15:07 IntruderSRB joined #git
15:08 _ikke_ uwe: not maintained in what sense?
15:09 LeBlaaanc joined #git
15:10 marcogmonteiro joined #git
15:10 AaronMT joined #git
15:13 _ADN_ joined #git
15:16 xissburg joined #git
15:17 Remramm joined #git
15:17 Remramm joined #git
15:18 dendazen joined #git
15:18 IntruderSRB joined #git
15:19 jj-_ left #git
15:19 str joined #git
15:20 mischat joined #git
15:23 uwe _ikke_: i mean was not in any versioning system
15:23 King_Hual joined #git
15:24 sostenuto joined #git
15:25 IntruderSRB joined #git
15:27 uwe i.e.; I imagine something along the lines of finding the closest version by looking up version or date, then fetch the whole code, and roll back to that version, fork, add the new code, and go one commit at a time checking the changes with vanilla somehow getting the changes from there to the fork until I'm at head ... then try to encapsulate those changes in lets say a skin or module if possible ...
15:27 staafl joined #git
15:28 staafl Does the recursive merge strategy consider intermediate commits or is it just base/ours/theirs?
15:28 Tobbi joined #git
15:28 jj- joined #git
15:28 qqx staafl: Just base/ours/theirs.
15:28 ToBeCloud joined #git
15:29 staafl qqx, doesn't sound very recursive to me :-)
15:29 dikiaap joined #git
15:29 qqx It's recursive with respect to the trees being merged, not history.
15:30 moritz it's job isn't to sound recursive :-)
15:30 axilaris joined #git
15:30 axilaris hi.... anyone can tell me how to force a merge from master to a branch ?
15:31 moritz axilaris: git checkout yourbranch; git merge --no-ff master
15:31 axilaris master overwrites everything on the branch
15:31 axilaris ok thanks @moritz
15:31 moritz axilaris: that doesn't override; it just merges
15:31 axilaris how can i override ?
15:31 kba So this seems to hapen quite often. I have two branches, master and devel. They were both at commit X. Then I create a commit on devel Y and push it. Now the branch is at Y.
15:32 moritz axilaris: why not just start a new branch?
15:32 Noldorin joined #git
15:32 kba Then I switch to master, chery-pick Y and push Y, but now master is at Z.
15:32 d1z joined #git
15:32 axilaris i prefer to maintain this branch for the customer
15:32 kba master and devel were both at X. I pushed Y to both of them. Now they're not on the same commit. What's happening?
15:33 kba https://github.com/Webstrat​es/Webstrates/commits/devel and https://github.com/Webstrate​s/Webstrates/commits/master
15:33 axilaris otherwise its confusing, so much has been done on master, i dont care the merge, just want to override master to the branch and make the config changes
15:33 kba Why is that happening?
15:34 kba Does that make sense? Am I misunderstanding something?
15:34 vibhavp joined #git
15:34 axilaris @moritz you know how to do the override ?
15:35 miczac joined #git
15:35 jast kba: cherry-picking copies commits and, in the process, creates a new committer/commit time entry, so the resulting commit ID is different even if the diff is exactly identical
15:35 axilaris git checkout dev_branch, git reset --hard master ?
15:35 Gravious joined #git
15:35 kba jast: I see! So what's the correct way to do it?
15:35 kba If I don't want the branches to diverge
15:35 moritz kba: merge
15:36 jast kba: well, if both branches were identical before, you can use 'git merge'
15:36 jast merge will automatically 'fast forward' (make the branch identical) the target branch is still at the base version
15:36 moritz axilaris: after a git reset, you have to push with --force, which won't preserve history
15:36 jast *if the target branch
15:37 moritz axilaris: so that's basically the same as deleting the branch, and starting a new branch with the same name as before
15:37 axilaris @moritz oh thats not good
15:37 djh joined #git
15:37 kba Won't that create an ugly commit with "Merge branch" commit message?
15:37 kba Or can I just change that to the other commit messages, and both branches will look identical again?
15:37 jast that's if the target branch has had new commits in the meantime
15:37 kba Ah, otherwise not? Great
15:37 jast if you're not sure, you can use --ff-only to make it abort if fast-forwarding is impossible
15:38 moritz axilaris: you can git checkout otherbranch; git checkout master .; git commit -m 'bring files to the state of the master branch' # or something along those lines
15:38 kba That's perfect! Thanks, moritz and jast
15:38 gugah joined #git
15:38 jast anyway, now that you've already pushed the cherry-picked commit, the only way to get the two branches identical again is to rewrite history, using force push
15:38 moritz or to merge them, and have the nearly identical commits twice in the history
15:38 jast technically you can get them identical using a merge commit, but I got the impression you'd rather avoid that
15:38 gugah joined #git
15:39 patarr joined #git
15:42 IntruderSRB joined #git
15:45 mischat_ joined #git
15:45 pur3eval joined #git
15:46 mischat_ joined #git
15:47 TheDcoder joined #git
15:47 TheDcoder Hi, how do I sign existing commits and tags?
15:47 MattMaker joined #git
15:47 cdown joined #git
15:51 shgysk8zer0_ joined #git
15:53 moritz TheDcoder: if it happens to be the newest commit, and not yet pushed, probably with git commit --amend
15:53 moritz git commit --amed --gpg-sign
15:53 TheDcoder no, its neither the newest nor un-pushed
15:54 TheDcoder actually, I was planning to sign ALL of my commits
15:54 moritz TheDcoder: then signing amounts to rewriting history, afaict
15:54 Murii joined #git
15:54 moritz somebody please correct me if I'm wrong
15:54 dreiss joined #git
15:55 morfin when unreachable nodes are removed?
15:55 TheDcoder hmm...
15:55 morfin only when you manually start gc?
15:55 _ikke_ morfin: unreferenced objects are not removed before 14 days, and the reflog keeps a reference for 90 days
15:55 _ikke_ morfin: some git commands automatically run gc
15:55 Gravious joined #git
15:58 gpkfr joined #git
15:59 morfin hmm
16:00 mischat joined #git
16:00 TheDcoder left #git
16:01 _ikke_ TheDcoder: Note that signing each commit has not much added benefit than signing a tag
16:01 gpkfr joined #git
16:02 gpkfr joined #git
16:02 rewt`` joined #git
16:03 gpkfr joined #git
16:04 timvisher is there any way to disable a remote for fetch/push purposes but to keep it for historical reference?
16:04 Snugglebash joined #git
16:05 perlpilot timvisher: you could rename it so that it's not easy to use.
16:06 lss8 joined #git
16:06 lss8 joined #git
16:06 BlessJah _ikke_: no benefit from end-user perspective, there are certain scenarios though where you might not want to truct code you downloaded from server unless signed
16:06 gpkfr joined #git
16:07 amagawdd joined #git
16:07 BlessJah timvisher: remotes are tied to particular clone (i.e. it exists only on your hard drive)
16:08 morfin i created second commit, reset --hard, then changed file, commited again and checked reflog
16:08 BlessJah timvisher: you might go to $REPOSITORY/.git/config and comment-out certain lines, it's pointless though - it's better to keep such information somwhere under doc/ if it's important
16:09 morfin it was looking like Initial -> second -> reset: moving to HEAD~1 -> third(which is second again)
16:10 _ikke_ BlessJah: If the tag is signed, it covers the commits
16:10 Murii joined #git
16:10 mischat joined #git
16:11 BlessJah _ikke_: are you sure that tag~ is ok to be signed? :>
16:12 Peetz0r joined #git
16:12 _ikke_ ok in what sense?
16:13 zivester joined #git
16:15 Derperpe1 joined #git
16:16 tribly joined #git
16:17 BlessJah _ikke_: malicious root user, some lines slipped in during rebase, server-side merges or rebases, "please apply this patch" sociotechnic
16:18 raijin joined #git
16:19 Raed|Mobile joined #git
16:20 mrVandermare joined #git
16:20 _ikke_ BlessJah: Then a signed commit is not going to help you too
16:20 _ikke_ At least, not going to guarantee that something has slipped in
16:20 dcy joined #git
16:20 _ikke_ has not*
16:21 Nilesh_ joined #git
16:21 _ikke_ rebases necessitate resigning of commits, and I doubt everyone is examining what they sign closely
16:21 IntruderSRB joined #git
16:22 gpkfr left #git
16:22 BlessJah yeah, rebase isn't best example
16:23 _ikke_ a gpg signature means that the commit came from someone, not that what they signed is benign
16:23 clemf joined #git
16:24 BlessJah but root won't sign a commit and victim of soctiotechnic cannot deny he/she applied the patch
16:24 _ikke_ (even if someone examines what they sign properly, the signature does not capture that
16:24 _ikke_ )
16:24 jagob joined #git
16:26 thiago joined #git
16:26 inbx joined #git
16:28 troulouliou_div2 joined #git
16:28 mgver joined #git
16:29 inbx_ joined #git
16:29 venmx joined #git
16:30 jimklo joined #git
16:31 ShekharReddy joined #git
16:32 Peetz0r joined #git
16:32 diogenese joined #git
16:32 Endorphine joined #git
16:33 marcogmonteiro joined #git
16:33 Glooomy joined #git
16:33 raijin joined #git
16:34 Murii joined #git
16:37 kavilraj joined #git
16:38 IntruderSRB joined #git
16:39 rivarun joined #git
16:40 inbx_ joined #git
16:41 jnewt1 joined #git
16:42 crose joined #git
16:42 Ryanar joined #git
16:43 brent__ joined #git
16:45 Murii joined #git
16:45 Peetz0r joined #git
16:45 flashpoint9 joined #git
16:46 vuoto joined #git
16:46 mgver how to create/restore backup from Gitlab?
16:46 robattila256 joined #git
16:46 pur3eval joined #git
16:47 flashpoint9 mgver: https://docs.gitlab.com/omn​ibus/settings/backups.html
16:48 _ikke_ whow
16:48 _ikke_ Did flashpoint9 join just to answer that?
16:49 sofly joined #git
16:49 mgver maybe haha
16:49 Electrometro joined #git
16:50 Somelauw left #git
16:52 mgver but still not understand
16:52 Ozymandy joined #git
16:52 mgver All configuration for omnibus-gitlab is stored in /etc/gitlab. To backup your configuration, just backup this directory.
16:52 mgver where are those files
16:53 Electrometro joined #git
16:55 lmclinskey joined #git
16:55 xall joined #git
16:56 sbulage joined #git
16:56 Murii joined #git
16:59 Tobbi joined #git
16:59 EricPoe joined #git
17:00 mgver how to access /etc/gitlab folder in windows?
17:00 mgver by cmd?
17:00 mgver or gitlab.com ?
17:00 svm_invictvs joined #git
17:01 clemf joined #git
17:02 _ikke_ You have to login to that server
17:02 _ikke_ ssh probly
17:02 _ikke_ probably
17:03 newbie1 joined #git
17:03 madewokherd joined #git
17:05 IndigoTiger joined #git
17:08 Jellyg00se joined #git
17:09 Darcidride joined #git
17:10 Snugglebash joined #git
17:13 Motoko joined #git
17:19 KMaia2 joined #git
17:20 clemf_ joined #git
17:20 Murii joined #git
17:20 Murii joined #git
17:22 reconx86_ joined #git
17:26 NaN joined #git
17:27 NaN what will happen if I do a rebase in my branch that someone has already merged into their own?
17:27 jstimm joined #git
17:28 NaN I want to do a clean merge from my branch (not clean, lots of commits) to master
17:28 Phil-Work NaN, not a lot
17:29 Phil-Work if/when they merge/rebase it'll dedup
17:29 Phil-Work might get some conflicts if you have to change the commits you're rebasing to resolve conflicts
17:29 bennigraf_ joined #git
17:30 venmx joined #git
17:31 Peetz0r joined #git
17:31 NaN so my coworker will have conflicts if I do a rebase to clean my branch?
17:31 NaN what about if I do a new branch, clean it an merge with master?
17:31 Murii joined #git
17:32 btree joined #git
17:32 BSAlb joined #git
17:32 marcogmonteiro joined #git
17:32 MineCoins joined #git
17:32 Murii joined #git
17:33 BSAlb joined #git
17:33 Naan joined #git
17:36 xissburg joined #git
17:37 jost__ joined #git
17:39 durham joined #git
17:41 hahuang65 joined #git
17:43 Guest85 joined #git
17:43 Peetz0r joined #git
17:44 Murii joined #git
17:44 nixjdm joined #git
17:45 Murii joined #git
17:46 xissburg joined #git
17:47 pur3eval joined #git
17:48 MattMaker joined #git
17:49 mischat joined #git
17:49 NaN squach or rebase to master?
17:51 danemacmillan joined #git
17:53 dviola joined #git
17:54 robotroll joined #git
17:54 thiago joined #git
17:56 Murii joined #git
17:57 gugah joined #git
17:58 Murii joined #git
17:58 tyreld joined #git
17:58 rgrinberg joined #git
17:59 King_Hual joined #git
17:59 King_Hual joined #git
17:59 kristofferR joined #git
18:00 navidr joined #git
18:01 publio joined #git
18:03 j7k6 joined #git
18:07 sbeller joined #git
18:08 j7k6_ joined #git
18:08 Glooomy joined #git
18:08 jnavila joined #git
18:08 reliability joined #git
18:08 Glooomy joined #git
18:09 Murii joined #git
18:09 Levex joined #git
18:09 Glooomy joined #git
18:10 Glooomy joined #git
18:11 Glooomy joined #git
18:13 jstimm joined #git
18:14 Brain joined #git
18:14 ratdeptrai joined #git
18:17 orzo joined #git
18:18 bennigraf_ joined #git
18:19 tang^ joined #git
18:19 danemacmillan joined #git
18:19 g105b joined #git
18:20 inbx__ joined #git
18:20 mda1_ joined #git
18:22 gugah joined #git
18:23 boombatower joined #git
18:24 xissburg_ joined #git
18:24 sbeller joined #git
18:24 Murii joined #git
18:25 overlord_tm joined #git
18:27 MattMaker joined #git
18:27 inbx__ joined #git
18:29 xissburg joined #git
18:31 brent__ joined #git
18:33 zzz joined #git
18:33 jason237 joined #git
18:34 duderonomy joined #git
18:34 j7k6 joined #git
18:35 satifant joined #git
18:36 mar77i joined #git
18:37 chardan joined #git
18:37 matoro joined #git
18:40 theoceaniscool joined #git
18:41 joshszep joined #git
18:42 fcas joined #git
18:43 mohabaks joined #git
18:43 chardan joined #git
18:43 eroux joined #git
18:44 baastrup joined #git
18:44 baastrup hey
18:44 gitinfo baastrup: 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.
18:44 Murii joined #git
18:45 baastrup hey any ideas how to run git push origin from crontab with ssh
18:45 baastrup I need it for a backup job
18:45 e01 joined #git
18:45 e01 joined #git
18:46 baastrup but the ssh-wont allow it
18:46 raynold joined #git
18:46 e01 joined #git
18:46 e01 joined #git
18:47 e01 joined #git
18:47 e01 joined #git
18:47 pur3eval joined #git
18:48 e01 joined #git
18:48 e01 joined #git
18:48 e01 joined #git
18:48 e01 joined #git
18:49 Vampire0 baastrup, What do you mean by "won't allow it"? I guess authentication fails which is most probably because the cron job is run as root while your SSH key is in your user configuration. Either let the cron job run as your user, or use `sudo -u youruser command` or `su -c command youruser` or specify the identity file (key for authentication) exlpicitly, e. g. by using SSH config files.
18:49 e01 joined #git
18:49 e01 joined #git
18:51 kasual joined #git
18:51 vdv joined #git
18:52 flavius joined #git
18:54 dreiss joined #git
18:56 baastrup Vampire0: its a user called rancid and it will run in crontab as that user, but still dont work, I think it has something to do with ssh-agent only working in the current terminal
18:56 Murii joined #git
18:58 raynold ahh it's a wonderful day
18:58 dsantiago joined #git
18:59 hfkhjgjhgkjhbyug joined #git
19:02 gugah joined #git
19:03 jstimm joined #git
19:05 Murii joined #git
19:05 reynierpm left #git
19:06 Sasazuka joined #git
19:07 Vampire0 baastrup, of course, if your key is challenge-protected it cannot work as you cannot unlock the key
19:09 Darren_ joined #git
19:10 Darren_ joined #git
19:14 emg joined #git
19:17 fcas joined #git
19:17 matoro joined #git
19:18 marc_v92 joined #git
19:20 btree left #git
19:20 muldover joined #git
19:21 jstimm joined #git
19:23 peterR`` joined #git
19:25 shgysk8zer0__ joined #git
19:28 cjohnson baastrup: you would need to figure out what "doesn't allow it " specifically means
19:28 cjohnson to solve the issue
19:28 cdg joined #git
19:29 efeuska joined #git
19:29 kst123 joined #git
19:30 Doow joined #git
19:30 mischat joined #git
19:32 BackEndCoder joined #git
19:32 gk-1wm-su joined #git
19:35 venmx joined #git
19:35 ecuanaso joined #git
19:36 jstein_ joined #git
19:37 nettoweb joined #git
19:38 Vampire0_ joined #git
19:38 pbrewczynski joined #git
19:39 crose joined #git
19:39 sgen joined #git
19:40 mar77i joined #git
19:42 nckpz joined #git
19:42 Levex joined #git
19:42 reznord joined #git
19:43 BackEndCoder joined #git
19:43 reznord hi, I want to make xhr call to the github API so, I can fetch the data of an user from github and render it in my application.
19:43 reznord How can i do that?
19:44 danemacmillan joined #git
19:44 reznord when I try to make normal API call, it is throwing me an error saying,
19:44 reznord https://www.irccloud.com/pastebin/2MnJzIvW/
19:44 j7k6 joined #git
19:45 btyne79 joined #git
19:46 g0th joined #git
19:46 g0th hi
19:46 g0th how do I revert the commited change on one file so that the push doesn't see anything of it?
19:46 g0th the rest of the commit is fine
19:47 Derperpe1 joined #git
19:48 solarfly joined #git
19:48 scoobertron joined #git
19:48 pur3eval joined #git
19:49 g0th or simpler: can I transform a commit back to staged or unstaged?
19:49 g0th git reset --soft HEAD^ ?
19:49 LiftLeft joined #git
19:49 e01 joined #git
19:49 e01 joined #git
19:49 solarfly Hi! I have a question. I have a branch with a new feature on it that is done and awaiting PR approval.  I have a second feature that builds on top of that one.  If I base the new feature B off of feature A,  what do I do in the B branch when A is finally merged to master?  Do I just git merge master into B to update my branch?
19:49 HuskyApocalypse joined #git
19:50 shgysk8zer0_ joined #git
19:52 jnewt joined #git
19:54 raijin joined #git
19:54 Eugene solarfly - how much do you / the project care about the prettiness of the history?
19:55 solarfly Not much.  I was just looking at maybe I can git merge Feature A into my feature B, as long as A gets PR'd into master first, will eveyrthing be clean?
19:55 Eugene Basically, yes
19:56 Eugene merging from master back to B before merging B into master(or rebasing B upon new-master) is something that you "can do", but not must
19:56 Eugene If you don't care what the log looks like then just go for it and stop worrying - git will merge things together exactly how it sounds like, and so long as the result works then you're good
19:57 solarfly So I could  merge A into B,  work,  then A get merged into master, and I can update my branch B with the changes from master to reduce the chance of diverging
19:57 solarfly Yep, don't care what it looks like as long as we can read the logs
19:57 Eugene If master has diverged by the time you merge B then yes, you'll need to resolve differences
19:58 Eugene This is only an issue if any conflicts have happened - if you're the only one working on a given portion of the repo then it would be darned hard for that to happen....
19:59 Eugene I would go ahead and start B directly from A: eg `git checkout -b B A`
19:59 Eugene If there's anything new in master that B needs then yes, merge it in
19:59 solarfly I've run into this type of thing repeatedly for years, but decided today I need to try to understand things better.  I found https://git-scm.com/book/en/v2/Git-B​ranching-Basic-Branching-and-Merging and http://stackoverflow.com/questions/896337​5/how-does-one-work-on-a-new-git-branch-t​hat-depends-on-another-git-branch-that-is
19:59 IntruderSRB joined #git
19:59 Balliad joined #git
20:00 solarfly Now that I'm a core developer and not managing engineers anymore (first time in 8 years)
20:00 Eugene !flow is a great read
20:00 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
20:01 Eugene Make up a flowchart that works for your project and stick to it
20:01 solarfly the team uses some semblence of git-flow.  Very loosely defined though;  there's feature branching and master.  That's about it so far
20:01 reznord can anyone help me with that?
20:01 Eugene I think that is just fine for $MADE_UP_PERCENTAGE of users
20:01 Eugene reznord - !github
20:01 gitinfo reznord: Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
20:01 solarfly nice :)   Thank you for your help Eugene
20:02 solarfly much appreciated
20:02 Eugene g0th - !fixup
20:02 gitinfo g0th: 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!
20:02 UrsoBranco joined #git
20:02 concerti joined #git
20:03 timvisher perlpilot, BlessJah: i'm thinking more in terms of `git fetch --all` etc. which i use a lot.
20:03 aidalgol joined #git
20:03 timvisher i basically don't want the remote to be considered for pushing or pulling when generic commands are used
20:04 j7k6_ joined #git
20:05 Dougie187 left #git
20:05 BSab joined #git
20:06 Guest4891 joined #git
20:07 Guest4891 joined #git
20:09 SwiftMatt joined #git
20:14 gijga joined #git
20:21 jimi_ joined #git
20:22 marc_v92 joined #git
20:22 amagawdd joined #git
20:24 alexandre9099 joined #git
20:27 Sasazuka_ joined #git
20:28 jdl joined #git
20:28 sveinse joined #git
20:30 sveinse Is there a way I can update/fetch all new updates, including all new branches, into a bare mirror?
20:31 finalbeta joined #git
20:33 sveinse I thought git remote update --prune did, but it does not
20:34 bernardio joined #git
20:34 guest joined #git
20:37 _ikke_ What are you missing?
20:38 sveinse _ikke_: A new remote branch that have come into existence since the mirror was created
20:39 sveinse I'd like to create a script that can inspect the origin and completely mirror it (that is include all branches and their refs)
20:39 durham joined #git
20:41 Vampire0 joined #git
20:41 clemf joined #git
20:42 ilpanda joined #git
20:45 sveinse The horrible, inefficient naive approach is to delete the mirror and git clone --mirror --bare whenever you'd need to sync the repos
20:45 BackEndCoder joined #git
20:46 m0viefreak joined #git
20:47 Emperor_Earth_ joined #git
20:47 _ikke_ git remote update or git fetch origin should wrok
20:47 _ikke_ work
20:49 pur3eval joined #git
20:49 sveinse _ikke_: no, it does not pick up a new remote branch. I see it with git branch -av thou
20:49 _ikke_ Then you have it
20:50 sveinse _ikke_: Have what?
20:50 e01 joined #git
20:51 sveinse _ikke_: I need a cron-job tool to keep our mirrors in completely sync with the remote origin. If a remote branch is created, then it needs to be picked up and fetched automatically
20:51 qqx sveinse: Was your "mirror" actually created as a mirror?
20:52 sveinse qqx: Created with git clone --bare --mirror
20:54 chipotle joined #git
20:56 sveinse Think I solved it. Some repos wasn't properly mirroring. Their remotes were showing up as remotes/origin/.. instead of having only one like you do for mirror repos
20:59 Motoko joined #git
20:59 ribasushi joined #git
21:00 Peetz0r joined #git
21:01 mda1 joined #git
21:03 xissburg_ joined #git
21:06 chardan joined #git
21:06 durham joined #git
21:09 tyreld joined #git
21:11 algun_ joined #git
21:12 Murr joined #git
21:12 Levex joined #git
21:13 masuberu joined #git
21:14 cdg joined #git
21:15 RxMcDonald joined #git
21:15 RxMcDonald how do you find when a file got deleted in the commit history?
21:16 kadoban git log -- the_file     should give you a good idea
21:16 crayon joined #git
21:18 durham_ joined #git
21:18 Sasazuka joined #git
21:20 dsdeiz joined #git
21:22 Sasazuka_ joined #git
21:25 jeffreylevesque joined #git
21:26 treehug88 joined #git
21:26 Vampire0 joined #git
21:28 theoceaniscool joined #git
21:28 Alienpruts joined #git
21:28 durham joined #git
21:32 joshszep joined #git
21:32 nettoweb1 joined #git
21:35 levex_ joined #git
21:36 LaptopBrain joined #git
21:37 viktor4 joined #git
21:38 durham joined #git
21:39 marc_v92 joined #git
21:39 l4v2 joined #git
21:40 Guest55 joined #git
21:40 cdg_ joined #git
21:40 e01 joined #git
21:40 e01 joined #git
21:41 BSaboia joined #git
21:43 RxMcDonald kadoban: well, it's not enough
21:43 RxMcDonald now showing when the file got deleted to be honest
21:43 RxMcDonald not ^
21:43 j7k6 joined #git
21:44 kadoban Should just be the first commit you see usually ... can't imagine a case it wouldn't be.
21:44 dviola joined #git
21:44 clemf joined #git
21:44 invisbl_ joined #git
21:44 RxMcDonald oh maybe because its a diff branch
21:44 RxMcDonald yea that's it
21:45 invisbl_ joined #git
21:49 newbie1 joined #git
21:49 Tobbi joined #git
21:50 pur3eval joined #git
21:52 durham joined #git
21:55 m4sk1n joined #git
21:56 BackEndCoder joined #git
21:57 durham joined #git
21:57 texasmynsted joined #git
21:57 shgysk8zer0_ joined #git
21:57 durham joined #git
21:57 texasmynsted if somebody rebases a branch and pushes it and I try to pull and am unable to ff.  How can I force my local to match the remote?
21:58 RxMcDonald texasmynsted: rm -rf && git clone
21:58 Karazhan joined #git
21:58 mutex joined #git
21:58 kst123 joined #git
21:58 solarfly He would lose local changes doing that
21:59 texasmynsted I ended up git branch -D foo
21:59 heroux_ joined #git
21:59 texasmynsted then git checkout foo
21:59 texasmynsted I am sure there is a better way
22:00 RxMcDonald if you don't have any stashed stuff or anything
22:00 Levex joined #git
22:01 kadoban texasmynsted: Probably 'git checkout the_branch && git reset --hard @{u}' or something
22:01 texasmynsted @{u}
22:02 texasmynsted what is that?  The upstream HEAD?
22:02 invisbl joined #git
22:03 kadoban It's short for upstream, ya
22:03 joshszep joined #git
22:03 kadoban man gitrevisions
22:03 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
22:03 kadoban It's in there
22:03 olivetree joined #git
22:04 elsevero joined #git
22:05 j7k6_ joined #git
22:06 blackwind_123 joined #git
22:08 kst123 joined #git
22:10 nettoweb joined #git
22:10 nickabbey joined #git
22:13 Endarked joined #git
22:13 ThiefMaster joined #git
22:15 mischat joined #git
22:15 ISmithers joined #git
22:15 l4v2 joined #git
22:17 M-ou-se joined #git
22:23 inflames joined #git
22:27 hdon joined #git
22:27 hdon hi all :) if i want to get an overview of the anatomy of my branches and heads, is there a way to use log --graph but filtering to only see heads and nearest common ancestors of heads?
22:28 Karazhan joined #git
22:28 CarlFK joined #git
22:29 todd_dsm joined #git
22:30 Eugene hdon - man git-log; see --all, --branches, --tags, etc
22:30 gitinfo hdon: the git-log manpage is available at http://jk.gs/git-log.html
22:31 Eugene Or you can manually specify anything you want for <revision range>
22:31 ThiefMaster joined #git
22:31 ThiefMaster left #git
22:32 hdon hm
22:33 hdon Eugene, but these options do not filter out the boring intervening revision history that i don't want to see
22:34 Eugene "History Simplification" section in the same man page
22:35 * hdon looks
22:38 Khep joined #git
22:39 kappy joined #git
22:43 NeverDie joined #git
22:44 Levex joined #git
22:44 mischat joined #git
22:44 ThiefMaster joined #git
22:46 RxMcDonald left #git
22:46 Levex joined #git
22:49 hdon maybe i'm not literate enough in git but i'm not seeing what i want here :C
22:50 hdon i thought --dense would do it
22:50 hdon actually i should test this in an isolated repo. this repo may not be a great test case
22:50 SwiftMatt joined #git
22:50 pur3eval joined #git
22:51 l4v2 joined #git
22:52 peeps[lappy] joined #git
22:53 hdon yeah i'm not seeing what i want
22:53 fstd_ joined #git
22:54 nowhereman joined #git
22:54 hdon 11608newchicagoproperties.com
22:54 hdon 11889philhornback.com
22:54 hdon 11945jeffbrumfieldrealestate.com
22:54 hdon 11954gregoryreecesmith.org
22:55 hdon 11944dclenterprisesinc.com
22:55 hdon 12069hollowayrealtyus.com/
22:56 hdon john lvm on 12069
22:56 hdon 11954grsglobalenterprisesinc.com
22:56 hdon 11646hallmarkproperties.net john lvm
22:56 bremner please stop.
22:56 hdon oh shit
22:56 Vampire0 Don't spam hdon
22:56 hdon sorry bremner wrong chan
22:56 Vampire0 Use pastebin if it is real conten
22:56 bremner okie dokie
22:56 hdon :3
22:56 gk--1wm- joined #git
22:57 Vampire0 mmh, eyes with tits?
22:59 chardan joined #git
23:01 fmeerkoetter joined #git
23:01 gk--1wm- left #git
23:02 denis_M joined #git
23:03 hdon is it perhaps simply the case that git does not have the history simplification mode that i want? i want to filter out any revisions that are neither: explicitly listed on the command line (or with --branches or similar) nor are the nearest common ancestors of such revisions
23:04 newbie1 joined #git
23:04 MonsterKiller joined #git
23:05 aidalgol joined #git
23:08 henriquev joined #git
23:09 jimi_ joined #git
23:11 Derperpe1 joined #git
23:12 Gloomy joined #git
23:14 gugah joined #git
23:16 BSAlb joined #git
23:17 durham_ joined #git
23:19 venmx joined #git
23:19 scoobertron joined #git
23:19 Raed|Mobile joined #git
23:21 chardan joined #git
23:24 Khisanth joined #git
23:26 durham joined #git
23:28 rivarun joined #git
23:28 Kaisyu joined #git
23:33 askb joined #git
23:35 Somelauw joined #git
23:35 dsdeiz joined #git
23:35 dsdeiz joined #git
23:37 BackEndCoder joined #git
23:38 ubuntu joined #git
23:40 captain joined #git
23:40 chachasmooth joined #git
23:49 matsaman joined #git
23:50 matoro joined #git
23:50 Mindi joined #git
23:50 utrack joined #git
23:51 pur3eval joined #git
23:52 _jaysen joined #git
23:53 lauren joined #git
23:54 lauren hallo! anyone know if there's an already written way to do sub-file "rename"-style tracking of hunks in git blame?
23:54 lauren or something like git blame
23:54 rgrinberg joined #git
23:55 lauren what I want is a git-blame-like-thing that shows me when a hunk was copied between files
23:55 lauren or just git log, but blame would be more useful
23:57 Onionnion joined #git

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