Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-25

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

All times shown according to UTC.

Time Nick Message
00:01 rkazak joined #git
00:06 Vinnie_win joined #git
00:06 thiago it's not random
00:06 IndigoTiger joined #git
00:07 pks joined #git
00:08 BlessJah the pseudorandom generator could've been seede with i.e. HEAD hash - that'd be random but reproducible
00:12 NeverDie joined #git
00:13 Hobbyboy joined #git
00:13 msonntag joined #git
00:14 Derperperd joined #git
00:14 BackEndCoder joined #git
00:18 mentazoom joined #git
00:23 mischat joined #git
00:27 lindenle joined #git
00:27 lindenle joined #git
00:28 lindenle joined #git
00:29 theoceaniscool joined #git
00:29 msonntag joined #git
00:31 theoceaniscool joined #git
00:31 prg3 joined #git
00:33 theoceaniscool joined #git
00:34 theoceaniscool joined #git
00:36 govg joined #git
00:37 mikecmpbll joined #git
00:37 mda1 joined #git
00:37 jccn joined #git
00:38 Anja_ joined #git
00:39 lindenle joined #git
00:39 theoceaniscool joined #git
00:41 theoceaniscool joined #git
00:41 MTecknology Is there some magical trick to tracking all remote branches? Is there some elite clan I can join to obtain this ability?
00:45 Vampire0 MTecknology, how would you define "tracking all remote branches"? What exactly do you expect to happen?
00:46 rewt MTecknology, maybe a bit of bash magic:  git branch -r | sed 's/.*\///' | xargs -I B git branch -f B origin/B
00:46 Junior joined #git
00:46 MTecknology I want 'git pull --all' to show me /all/ changes that happened in a repo, not just in the branches I've checked out once upon a time. I can fix that by doing git checkout on all branches, but that seems clunky so I've been trying to find something better.
00:47 ToxicFrog MTecknology: the default behaviour is to fetch all remote branches when you "git fetch"; check your remote definition
00:47 dirtyroshi joined #git
00:48 ToxicFrog And also see "git help fetch" and look at the section titled "CONFIGURED REMOTE-TRACKING BRANCHES"; that includes exactly the configuration you need to make it behave that way if it didn't get set up properly originally.
00:48 rominronin joined #git
00:48 MTecknology I guess I've never understood fetch vs. pull, maybe learning that makes my question rather silly?
00:48 rewt pull is just fetch+merge
00:49 Vampire0 or fetch+rebase, depending on configuration and parameters
00:49 ToxicFrog MTecknology: "git pull" is "git fetch" followed by "git merge <name of remote tracking branch corresponding to your current branch>"
00:49 ToxicFrog "git fetch" is the bit that actually downloads new commits from the remote(s) and updates the remote tracking branches.
00:49 MTecknology :D  thanks!
00:50 MTecknology rewt: heh, I like that little magic trick
00:50 Samual joined #git
00:51 micah joined #git
00:52 micah i have a repository i just cloned and I want to push everything to a new location. I did git push --all and git push --mirror, but that only created all the tags on the new remote, how do I push all the branches? do I really need to do git checkout -b foo origin/foo; git push newremote foo; for every branch?
00:57 dunpeal left #git
00:57 Guest36461 joined #git
01:04 |prawnzy joined #git
01:08 eroussel joined #git
01:10 lindenle joined #git
01:11 anuxivm left #git
01:12 ToBeCloud joined #git
01:14 weylin joined #git
01:14 Derperperd joined #git
01:18 afuentes joined #git
01:19 cdg joined #git
01:21 rkazak joined #git
01:24 mischat joined #git
01:25 Xionkana joined #git
01:25 Darren_ joined #git
01:26 Xionkana Hey folks, I'm trying to git pull, but it says I have no merge base.
01:26 Xionkana Gitkraken shows me two branches (both master), that are not connected at all.
01:28 MTecknology are you in a detached head?
01:28 aypea[3] tee-hee
01:28 Xionkana Possibly, how can I tell?
01:29 Xionkana I tried a git checkout and it says the branches have diverged.
01:30 Xionkana Tried a git pull, "failed: refusing to merge unrelated histories"
01:30 SwiftMatt joined #git
01:31 rewt git status
01:31 rewt "unrelated histories" sounds to me like they have no common commit
01:32 Xionkana Yeah, exactly. There's no ancestry in the paths I see in gitk.
01:32 Xionkana I'm not even sure how I did that, haha.
01:32 rewt is this a shallow clone?
01:33 rewt try:  git fech --unshallow
01:33 Xionkana Nope, it's a complete repo.
01:33 Xionkana It has only 5 commits, 2 from this machine that are diverged, and 3 from my other computer.
01:34 Xionkana Apparently there's a --allow-unrelated-histories flag on git merge.
01:34 denete_ joined #git
01:34 Xionkana I made a backup so I'll give that a shot.
01:36 GavinMagnus left #git
01:36 lawltoad joined #git
01:39 Vampire0 Xionkana, to get into such a situation is easy. Just start two new repos, do some commits, then add the one as remote to the other and you get two independent branches like you have
01:39 martin290 joined #git
01:39 Xionkana Ahh
01:39 Vampire0 Xionkana, you can even do it in one repo with `git checkout --orphan`, but you would remember if you did that
01:41 Xionkana haha
01:41 Xionkana Yeah
01:41 Xionkana I don't think I would've risked that.
01:41 snowkidi_ joined #git
01:41 MeltedLux joined #git
01:41 Vampire0 No risk involved
01:41 Xionkana No I mean, I don't run git commands I don't truly understand.
01:41 martin290 if i change a file that hasn't been committed and i want to go back to how it was on the last commit, how do i do that?
01:46 rewt martin290, try:  git checkout @ -- filename
01:46 kadoban 'git checkout -- the_file' to go back to what's in the index. There is one that'll go back to what's in the current commit, but will that work for you? It's a safery default, much harder to lose work that way.
01:46 kadoban Actually ... not a big safety difference really.
01:47 martin290 i'm very new to git, so i'm not sure what but as long as it goes back to the current commit, it's fine :)
01:47 martin290 thanks kadoban!
01:48 giraffe joined #git
01:48 lawltoad Hi, after a rebase I had a merge conflict. When I use mergetool (with vimdiff) it opens up 4 windows. If understand correctly: what's in each of those windows is 3 temporary files and the working directory file. Is there an easy way to see what commit hash each of those 3 files is from?
01:50 hwrdprkns joined #git
01:52 rivarun joined #git
01:52 rewt lawltoad, the left one is your last commit on the branch you're on, the right one is what you're merging in, and the middle one is the last common ancestor
01:52 cyan__ joined #git
01:53 JanC_ joined #git
01:54 sargas joined #git
01:54 druonysus_ joined #git
01:55 mehola joined #git
01:55 snowkidi_ joined #git
01:57 jmpp joined #git
01:57 lawltoad rewt, but what commit hash are they from?
01:58 martin290 left #git
01:59 rewt your branch and the one you're merging in are easy to figure out, and for the common ancestor have a look at man git merge-base
01:59 gitinfo the git-merge-base manpage is available at http://jk.gs/git-merge-base.html
02:00 rewt there's also files in the .git dir that refer to them, i think by commit hash
02:07 nowhereman joined #git
02:07 deadprez joined #git
02:07 nckpz joined #git
02:09 deadprez left #git
02:10 finalbeta joined #git
02:10 Vinnie_win_g joined #git
02:11 jimi_ joined #git
02:12 lawltoad ahh, thanks!
02:12 lawltoad so I take it there is no official way to get it
02:12 Derperperd joined #git
02:17 rewt git commands are as official as you can get
02:19 micah left #git
02:19 rominronin joined #git
02:24 svm_invictvs joined #git
02:25 mischat joined #git
02:26 robattila256 joined #git
02:27 pks joined #git
02:28 neunon joined #git
02:31 druonysus_ joined #git
02:32 ismaris joined #git
02:32 a_thakur joined #git
02:33 Oatmeal joined #git
02:35 raspado joined #git
02:36 energizer joined #git
02:41 Samual joined #git
02:46 dzho_ joined #git
02:46 Nokurn joined #git
02:46 lobbo30 joined #git
02:46 lobbo30 left #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | 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 | This channel may contain users known to the state of California to cause cancer.
02:50 Cabanossi joined #git
02:52 aavrug joined #git
02:52 dreiss joined #git
02:53 Vampire0_ joined #git
02:54 jameser joined #git
02:55 safe joined #git
02:56 d^sh joined #git
03:00 bilb_ono joined #git
03:00 bilb_ono please help me push with the correct user name
03:01 bilb_ono I have set GIT_COMMITER_NAME, GIT_AUTHOR_NAME,  git config user.name all to the correct name
03:01 z3t0 joined #git
03:01 bilb_ono however it still always comes back with remote: Permission to <repo> denied to AlexMarshall12
03:01 aw1 joined #git
03:01 bilb_ono AlexMarshall12 is the wrong username
03:01 bilb_ono I need it to try again with the right one
03:02 bruce_lee joined #git
03:02 bruce_lee joined #git
03:02 bilb_ono I know you need to set the keychain? or token?
03:03 bilb_ono what is the way to do this on osx?
03:04 bilb_ono nvm it was keychain access
03:04 hwrdprkns joined #git
03:04 madduck joined #git
03:04 madduck joined #git
03:05 Vinnie_win joined #git
03:06 mar77i_ joined #git
03:07 sunri5e joined #git
03:08 Emperor_Earth joined #git
03:08 drbean joined #git
03:09 mizu_no_oto joined #git
03:09 dreiss joined #git
03:09 cdg joined #git
03:11 ome joined #git
03:11 Orphis joined #git
03:12 navidr joined #git
03:16 chardan joined #git
03:18 Rodya_ joined #git
03:18 Vortex34 joined #git
03:20 Cabanossi joined #git
03:20 Junior joined #git
03:26 mischat joined #git
03:26 fstd_ joined #git
03:29 giraffe joined #git
03:30 adymitruk I'm getting some funny bash issues with git hooks
03:30 adymitruk can anyone help?
03:30 mizu_no_oto joined #git
03:31 adymitruk I'm trying to write some server side ones but bash seems to not work as expected..
03:32 kadoban_ joined #git
03:32 govg joined #git
03:33 Rodya_ joined #git
03:33 griffindy joined #git
03:35 ecuanaso joined #git
03:35 chachasmooth joined #git
03:37 adymitruk here is what I'm not able to get working: https://gist.github.com/adymitruk​/c76b6b1ada597beec9525ad44a39adbc
03:38 a_thakur joined #git
03:38 adymitruk my bash version is: GNU bash, version 4.3.46(1)-release (x86_64-pc-linux-gnu)
03:38 adymitruk I'm testing it out on a local bare repo
03:38 adymitruk I'm running KDE Neon
03:39 a_thakur joined #git
03:39 adymitruk any help is appreciated
03:41 adymitruk Nevermind :) I forgot the 000 ref
03:42 jinks7 joined #git
03:42 ResidentBiscuit joined #git
03:42 FabTG joined #git
03:43 jinks7 Hi everyone, could anyone help me with the git source code? im looking for git's code that handles opening an editor for the commit message, does any one have any ideas?
03:44 Hello71 grep EDITOR
03:45 jinks7 okay cheers
03:45 kadoban Well, it'd really have to be at least referenced from 'git commit', that seems like a good place to start.
03:46 jinks7 yeah i had a look at commit.c and commit.h but couldnt find anything about an editor
03:46 jinks7 editor.c is where it is though
03:52 duderonomy joined #git
03:52 rominronin joined #git
03:54 Darren_ joined #git
03:54 pks joined #git
03:55 yonatankoren joined #git
03:56 MacWinner joined #git
04:06 roelmonnens joined #git
04:06 hexagoxel joined #git
04:09 z3t0 joined #git
04:09 mohabaks joined #git
04:10 cdg joined #git
04:12 matsaman joined #git
04:12 jinks7 left #git
04:12 dsdeiz joined #git
04:15 Corosauce joined #git
04:16 mehola joined #git
04:22 prawnzy joined #git
04:27 arescorpio joined #git
04:27 mischat joined #git
04:30 Cabanossi joined #git
04:40 rtm1046 joined #git
04:42 mentazoom joined #git
04:43 pur3eval joined #git
04:45 ayogi joined #git
04:47 snowkidi_ joined #git
04:47 dhollinger joined #git
04:50 dsdeiz joined #git
04:54 energizer joined #git
04:56 PerlJam joined #git
04:56 Rodya_ joined #git
04:59 arnas joined #git
05:00 dermoth joined #git
05:04 sandman13 joined #git
05:09 donught joined #git
05:09 donught joined #git
05:11 cdg joined #git
05:15 Cabanossi joined #git
05:22 douglascorrea joined #git
05:22 wilornel joined #git
05:23 wilornel Hey #git! `git checkout -- .` hangs. I only have some videos that were modified and others that were deleted as the changes.
05:23 wilornel It seems to me like by .git directory needs to be cleaned up, maybe?
05:23 rominronin joined #git
05:23 wilornel my*
05:25 chachasmooth joined #git
05:25 kadoban How big are said videos?
05:28 mischat joined #git
05:28 lindenle joined #git
05:28 wilornel I'd like to run a script to calculate that. What tag (equivalent to HEAD) can I use to represent the current working directory? HEAD..TAG
05:29 pur3eval joined #git
05:30 wilornel alright, I'll go through them manually quickly
05:32 wilornel A total of 87MB
05:32 wilornel kadoban
05:33 kadoban Then I'm not sure
05:35 fahadash joined #git
05:36 wilornel Hmmm... there's `git-lfs filter-process` running when I do `git checkout -- .`
05:36 wilornel I did `git lfs track ".mp4"
05:36 cdown joined #git
05:38 sbulage joined #git
05:38 TomTomTosch joined #git
05:39 ckruczek joined #git
05:41 sarri joined #git
05:41 sarri joined #git
05:43 sandman13 left #git
05:44 Goplat joined #git
05:45 chachasmooth joined #git
05:47 aw1 joined #git
05:49 z3t0 joined #git
05:52 thiago joined #git
05:53 snowkidi_ joined #git
05:53 mohabaks joined #git
05:54 chachasmooth joined #git
05:54 xall_ joined #git
05:56 brent__ joined #git
06:00 denete joined #git
06:02 osse lfs uses the network, doesn't it?
06:02 krillr joined #git
06:02 thiago yes
06:04 aw1 joined #git
06:04 wilornel Hmm... .git is 1.3GB big
06:04 wilornel I need to clean it up it seems, right?
06:04 Blendify joined #git
06:05 Blendify what can cause? https://developer.blender.org/rB1ad8​42d432ccacd1f822d7f2b8ff3c542d25e976
06:05 Blendify the subproject stuff?
06:05 Blendify I did not edit that stuff?
06:05 thethorongil joined #git
06:06 thethorongil joined #git
06:06 wilornel osse, thiago: Well, with the current state my repo is in, if I run `git rebase -i some_commit`, it hangs. Then, I terminate the command and run `git lfs uninstall` and re-run the rebase command and it works.
06:06 wilornel that makes me thnk that it will not only have an effect in the network
06:06 kadoban Blendify: Pretty unclear what you're talking about. Remember nobody else is in your head.
06:07 wilornel it will also have an effect on .git
06:07 pur3eval joined #git
06:08 Blendify kadoban, I did not edit the subproject stuff so why is it committed?
06:08 Blendify what is the best way to revert what I did?
06:08 osse Blendify: did you use 'git add .' ? 'commit -a' ?
06:08 Blendify yes
06:08 osse Stop doing that then
06:08 thiago wilornel: which subdir of .git is bug?
06:09 * Blendify got lazy...
06:09 wilornel thiago: I do not know which subdir of .git is bug
06:09 wilornel What do you mean by that?
06:10 thiago I want you to find out which one
06:10 thiago wilornel: are you using git lfs or something like that?
06:10 wilornel How can I tell? Alright... I'll do some checks
06:10 Blendify osse, how should I revert this?
06:10 osse Blendify: what has probably happened is: you have pulled, the submodules have therefore changed what commit they point to, but you did not 'git submodule update' so when you added everything you effectively reverted it back
06:10 wilornel git lfs yes
06:10 wilornel I am trying to add git lfs to my project
06:10 wilornel I had already committed some .mp4 files  to my repo
06:10 wilornel and they are on bitbucket
06:10 osse Blendify: probably  git checkout badcommit~1 -- subprojectpaths && git commit
06:11 wilornel However, the recent commits I am doing are very slow at getting pushed to bitbucket
06:11 thiago wilornel: I can't help with lfs
06:11 wilornel Alright
06:12 cdg joined #git
06:12 thiago Blendify: you added the submodules to your commit. If you don't want that, then don't add them.
06:12 dec0n joined #git
06:13 chachasmooth joined #git
06:15 netj joined #git
06:15 jay-m joined #git
06:15 jokajak joined #git
06:16 adino joined #git
06:17 dreiss joined #git
06:17 icedp joined #git
06:17 rebrec joined #git
06:17 LordRyan joined #git
06:18 subhojit777 joined #git
06:18 jagob joined #git
06:19 Rodya_ joined #git
06:20 Nicmavr joined #git
06:20 jokajak joined #git
06:20 rscata joined #git
06:21 chachasmooth joined #git
06:22 peeps[lappy] joined #git
06:25 wilornel Hmm... dealing with these videos is slowing down everything in my repository
06:26 cyan__ joined #git
06:26 wilornel the strange part is that I was able in the past to work with a video in the repository. In fact, there is a video in the hosted repository now.
06:26 wilornel However, I cannot find a way to do changes to them now
06:26 wilornel And adding them to git lfs does not help. I should remove them from the repo, add `git lfs track "*.mp4"` and put them back
06:27 wilornel So now it's rewriting history. We are a one developer team, so it should be fine
06:28 thiago if you're a team, then rewriting history is not good
06:28 thiago if you're alone, it works
06:29 mischat joined #git
06:29 wilornel What alternative do I have? I guess  I could try doing a revert
06:29 wilornel - revert; - git lfs track "*.mp4" ; - git revert again
06:29 thiago well, that's not going to help with size
06:29 thiago you don't have a choice: you have to rewrite history
06:30 thiago just tell everyone in your team to delete their repositories and clone again
06:30 wilornel good
06:30 Cabanossi joined #git
06:30 wilornel I've never rewritten history in the hosted repo
06:30 wilornel Any tips? What I've done in the past is create a new master branch, named master2
06:30 wilornel I don't know if I can just rewrite a few branches and then push those and have the server incorporate them as they are
06:30 chachasmooth joined #git
06:31 thiago like I said, delete all repos and recreate
06:31 wilornel a new repository completely
06:31 thiago except for the one you're doing the rewrite on
06:31 thiago yes
06:31 wilornel good
06:32 syg__ joined #git
06:37 chachasmooth joined #git
06:38 pur3eval joined #git
06:40 thiago joined #git
06:42 rominronin joined #git
06:49 dersand joined #git
06:52 ThomasLocke joined #git
06:52 ThomasLocke joined #git
06:52 zeroed joined #git
06:52 zeroed joined #git
06:54 hhee joined #git
06:55 Raging_Hog joined #git
06:57 Darren_ joined #git
06:57 pks joined #git
06:59 ihradek joined #git
07:00 zeroed joined #git
07:02 griffindy joined #git
07:02 Mo joined #git
07:05 Darren_ joined #git
07:08 tirej joined #git
07:08 tirej joined #git
07:10 jknetl joined #git
07:12 pR0Ps joined #git
07:12 qt-x joined #git
07:12 cdg joined #git
07:15 donught joined #git
07:15 zefferno joined #git
07:17 dsdeiz joined #git
07:17 dsdeiz joined #git
07:17 freimatz joined #git
07:17 zeroed joined #git
07:19 jstein_ joined #git
07:21 ngm joined #git
07:21 roelmonnens joined #git
07:23 Hudu joined #git
07:24 chele joined #git
07:25 lordjancso joined #git
07:26 dreiss joined #git
07:27 jsolano joined #git
07:27 tvw joined #git
07:28 tvw joined #git
07:30 jmpp joined #git
07:35 miczac joined #git
07:35 t-mart_ joined #git
07:36 PaulCape_ joined #git
07:39 rideh joined #git
07:39 visual joined #git
07:39 sostenuto joined #git
07:39 jnavila joined #git
07:40 visual joined #git
07:41 visual hey
07:41 matsaman heyo
07:41 visual in order to change branch -> commit -> push ->change branch back
07:41 visual is this how you do it?
07:41 visual git checkout -b "branch name"
07:42 visual git commit . -m 'issue s'
07:42 visual git push origin [name_of_branch]
07:42 visual ?
07:42 grawity if you just made some changes and realized they should be on a new branch? yeah, that'll work
07:42 matsaman git checkout -b foo would actually create a new branch named foo, from the branch you currently had checked out
07:43 visual that's the plan
07:43 visual and to checkout master branch after that?
07:43 visual git checkout master/
07:43 spacelord_ joined #git
07:43 visual ?
07:43 erguven joined #git
07:44 s2013 joined #git
07:44 matsaman yes
07:44 Xionkana joined #git
07:45 Snugglebash joined #git
07:45 Nokurn joined #git
07:47 ac3takwas joined #git
07:48 JeroenT joined #git
07:49 visual thanks my men
07:49 Singmyr joined #git
07:49 JeroenT joined #git
07:50 sarri joined #git
07:50 sarri joined #git
07:51 djb-irc joined #git
07:53 ferr1 joined #git
07:54 aidalgol joined #git
07:57 jsolano joined #git
07:59 eduardas_m joined #git
08:02 mischat joined #git
08:02 Tobbi joined #git
08:04 msonntag joined #git
08:06 a_thakur joined #git
08:08 cqi joined #git
08:08 mikecmpbll joined #git
08:09 elect__ joined #git
08:10 msonntag joined #git
08:13 cdg joined #git
08:13 jay-m joined #git
08:16 cdown joined #git
08:16 Snugglebash joined #git
08:18 ThomasLocke_ joined #git
08:19 eduardas_m joined #git
08:22 cdown joined #git
08:22 jokester joined #git
08:23 Alienpruts joined #git
08:24 mikecmpbll joined #git
08:25 Tobbi joined #git
08:27 a_thakur joined #git
08:27 GT4066 joined #git
08:28 Phenix joined #git
08:28 nowhereman joined #git
08:29 theoceaniscool joined #git
08:30 Cabanossi joined #git
08:32 theoceaniscool joined #git
08:36 overlord_tm joined #git
08:38 a_thakur joined #git
08:39 MrMojito joined #git
08:41 wrouesnel joined #git
08:42 sbulage joined #git
08:43 Balliad joined #git
08:44 zefferno joined #git
08:46 jnewt_ joined #git
08:49 Derperperd joined #git
08:49 bilb_ono joined #git
08:50 Muzer joined #git
08:50 Tobbi joined #git
08:51 slax0r joined #git
08:51 slax0r hello, is it possible to see which pushes were forced on the remote?
08:51 govg joined #git
08:53 nettoweb joined #git
08:54 texinwien joined #git
08:54 osse slax0r: AFAIK no, but you can create a hook to log it
08:55 slax0r yeah, a bit late for that, some genius force pushed, rewriting history, instead of solving conflicts ~2months ago, and now I get to fix this mess of missing code
08:55 slax0r I've located one commit that did this, wanted to check if there are more
08:55 tobiasvl slax0r: also a bit late, but consider disallow force pushing
08:56 slax0r yeah, did that now
08:56 slax0r did not actually think I'd need to do that, ever
08:56 osse slax0r: you could scan the central repo or unreachable objects and such, maybe you're lucky
08:56 heliomas_ joined #git
08:56 armin joined #git
08:57 slax0r it's going to be a long day... well, thank you anyway!
08:57 osse git fsck --lost-found
08:58 nostrora joined #git
08:59 Felishia joined #git
08:59 Felishia I need a lil halp
08:59 Felishia I commited all the changes in develop
08:59 Felishia and I was supposed to commit them in a new branch
08:59 Felishia how do I send the changes to this new branch?
09:00 osse Felishia: git branch newbranch; git reset --hard HEAD~1; git checkout newbranch
09:00 osse depending on how many commits you made
09:00 slax0r osse: thanks!
09:01 osse Felishia: https://github.com/Osse/git-stuff/bl​ob/master/git-reset-explanation.txt
09:01 Felishia osse, like 9
09:01 Felishia but I'd need to make the commits again D:
09:01 Felishia really :c
09:01 osse no you don't
09:01 osse change the 1 to 9 and you're good
09:01 osse see the link
09:01 marcogmonteiro joined #git
09:02 BackEndCoder joined #git
09:02 Felishia 8 to be exact
09:02 slax0r Felishia: by creating a new branch while on develop, you create a, so to speak, copy of develop branch, remove those commits from develop, and you still have those commits in the new branch you created before
09:05 Felishia okay :o
09:07 zefferno joined #git
09:13 Tobbi joined #git
09:14 kadoban joined #git
09:14 cdg joined #git
09:15 masuberu joined #git
09:16 kurkale6ka joined #git
09:18 byte512 joined #git
09:19 snits` joined #git
09:24 visual left #git
09:24 ignarps joined #git
09:29 zeroed joined #git
09:29 zeroed joined #git
09:30 zefferno joined #git
09:30 vkipy joined #git
09:31 jay-m joined #git
09:31 mentazoom joined #git
09:32 vkipy hi
09:32 gitinfo vkipy: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
09:33 ^7heo wtf, seriously?
09:33 dsdeiz joined #git
09:33 dsdeiz joined #git
09:33 ^7heo and then people are like "don't paste on IRC"
09:33 vkipy While doing git push origin master, i'm getting fatal : authentication failed....
09:34 vkipy i'm using gerrit server
09:34 vkipy i can log into the webpage/server
09:34 vkipy from commandline when i do push with the same password.. i'm getting the error
09:35 vkipy git remote -v points to the correct url
09:35 vkipy i've freshly added the public key before doing any of this
09:35 vkipy Can anyone recommend me a solution?
09:36 osse ^7heo: what's the problem ?
09:36 Tobbi joined #git
09:36 osse vkipy: does ssh -T user@host  work ? where user and host are the same as the remote url
09:38 ^7heo osse: have you ever seen it on a smartphone screen? :D
09:39 ^7heo osse: you can forget anything else on the screen.
09:39 ^7heo osse: it's not hard to send a notice to the user instead.
09:39 vkipy osse: i'm getting permission denied
09:39 vkipy osse: i'm getting permission denied, please try again.
09:39 TomyLobo joined #git
09:39 cyan__ joined #git
09:40 ^7heo osse: and there's a reason why many many chans do it.
09:40 miczac joined #git
09:41 NwS joined #git
09:43 marcogmonteiro joined #git
09:44 clmsy joined #git
09:45 Cabanossi joined #git
09:48 Serpent7776 joined #git
09:48 mentazoom joined #git
09:50 theoceaniscool joined #git
09:51 mml joined #git
09:52 TomyLobo can anyone recommend a gui that supports git-lfs and at least github repositories?
09:53 TomyLobo preferably not just github :)
09:53 rossome joined #git
09:53 TomyLobo but if everything else is shit or non-free, meh...
09:53 t0by joined #git
09:53 t0by joined #git
09:55 kadoban git-lfs is pretty close to github specific. I think bitbucket added support for it recently-ish, I dunno if their GUI stuff does it ... I don't really use any GUIs personally, but it's where I'd look if you want I guess.
09:56 TomyLobo gitlab has git-lfs support
09:56 b100s joined #git
09:56 belak Git LFS is thankfully a spec that a number of companies have worked on together
09:57 belak One of the few things GitHub and Bitbucket have collaborated on
09:57 TomyLobo and it's close to transparent, i like it
09:57 belak In terms of GUIs I have no idea though
09:57 TomyLobo and i kinda need it. i have about a gigabyte of assets and no artifact storage :)
09:57 askb joined #git
09:58 kadoban belak: Well, at one point there was no reference server that was supposed to be used for production, AFAIK for a decent amount of time the only actually usable server was github.
09:58 kadoban If they worked together on it that doesn't seem to make sense. It's always possible I'm remembering wrong though.
09:59 TomyLobo maybe github's engineers are just better? :)
09:59 manuelschneid3r joined #git
10:00 belak Bitbucket was initially working on something almost exactly the same at the same time. When GitHub announced the same day we did (at a conference IIRC) both companies decided it would be best to work together
10:00 cyan__ joined #git
10:00 belak TomyLobo: hey now, no need for that :P
10:02 belak kadoban: it is true that GitHub had it usable before us, but that's because we were initially working on (essentially) a competing option
10:02 kadoban I see
10:03 TomyLobo and you didnt wanna go this route, i guess? https://xkcd.com/927/
10:03 belak The problem with the existing solutions(among other things) was that there were many of them and none of them had company backing
10:03 belak TomyLobo: exactly. Especially because that's one of the reasons other than usability that other solutions never caught on.
10:04 kadoban So none of the other solutions caught on, partly because there were too many, therefore you made another?
10:05 Derperperd joined #git
10:05 nopf joined #git
10:05 belak We made another solution because of usability. Most required the user to set up AWS credentials or something similar. We (and GH) wanted to make it as simple as downloading the client and turning it on in the repo
10:06 tirej joined #git
10:07 kadoban That sounds like a much better reason
10:08 belak It wasn't completely that there were too many... Just that they worked around the fact that they didn't have control over the server.
10:08 belak Controlling the server as well makes it possible to handle this sort of thing more seamlessly
10:09 PCatinean joined #git
10:10 mbrumbelow joined #git
10:10 Gloomy joined #git
10:11 Raging_Hog joined #git
10:11 Ediz joined #git
10:12 Ediz joined #git
10:13 bongjovi joined #git
10:14 osse vkipy: In that case it's a general ssh issue
10:14 vkipy ok
10:14 osse Use -vvv to get more logging. Maybe it disregards your key
10:14 vkipy how can solve the issue with git?
10:15 osse If you fix ssh then Git will be fixed as well
10:15 vkipy ok
10:18 mbrumbelow joined #git
10:18 JeroenT joined #git
10:18 tinti joined #git
10:19 JeroenT_ joined #git
10:19 mischat joined #git
10:21 durham joined #git
10:22 mehola joined #git
10:25 Ice_Strike joined #git
10:28 jozwior joined #git
10:30 Cabanossi joined #git
10:31 ecuanaso joined #git
10:38 lss8 joined #git
10:39 afuentes joined #git
10:39 LBV_User joined #git
10:41 Tobbi joined #git
10:41 Junior joined #git
10:42 mbrumbelow joined #git
10:42 King_Hual joined #git
10:42 King_Hual joined #git
10:42 ankit01ojha joined #git
10:45 finalbeta joined #git
10:46 djb-irc joined #git
10:50 Bloo[m] left #git
10:51 MineCoins joined #git
10:51 kozie joined #git
10:51 kozie Hi all.. it seems i have a strange problem
10:52 kozie it seems a few merges has been applied to one branch.. now allot of files seems to be missing.. but using command like 'git log --follow -p -- $file' is only showing stuff when it's added or modified
10:52 BackEndCoder joined #git
10:52 kozie it doesn't show deletes or whatever.. it looks like some merge or commit removed allot of files but there is no history of it
10:53 root____2 joined #git
10:53 YuGiOhJCJ joined #git
10:55 timdiels joined #git
10:59 ecuanaso joined #git
11:00 Cabanossi joined #git
11:00 jozwior joined #git
11:01 dedondesta left #git
11:01 root____1 joined #git
11:01 cayre joined #git
11:01 mda1 joined #git
11:02 archie joined #git
11:02 timdiels I'd like my readme file to be generated with $version placeholders replaced by the actual project version. I currently have a pre-commit hook that regenerates the readme before each commit but it does not rerun when a commit is replaced ('edited') by a rebase. How can I trigger it on each change by a rebase as well? Or is there an alternative way of having the correct version in the readme? I'm using it to
11:03 timdiels link to the right badges.
11:03 timdiels Thanks in advance
11:03 tsdev joined #git
11:03 mbrumbelow joined #git
11:03 kadoban timdiels: Where is the "actual project version" generated from?
11:04 kadoban And is the readme tracked content?
11:05 Shakeel_ joined #git
11:05 ShalokShalom_ joined #git
11:06 Derperperd joined #git
11:06 denete_ joined #git
11:07 archie_ joined #git
11:07 timdiels kadoban: the readme is tracked is it's the root readme that appears on the GitHub project's page. The project version is generated by PyBuilder. build.py sets the project version, but PyBuilder may tack on a .dev if it notices it's not a release commit.
11:08 Tobbi joined #git
11:08 timdiels *as it's
11:09 nopf joined #git
11:09 elect joined #git
11:12 ecuanaso joined #git
11:13 kadoban joined #git
11:13 JeroenT joined #git
11:14 theoceaniscool joined #git
11:15 cdg joined #git
11:18 m4sk1n joined #git
11:22 kadoban joined #git
11:22 Tobbi joined #git
11:27 wget joined #git
11:27 wget joined #git
11:27 chipotle joined #git
11:28 Impaloo joined #git
11:30 Cabanossi joined #git
11:34 Random832 joined #git
11:36 douglascorrea joined #git
11:37 b1tchcakes joined #git
11:40 theoceaniscool joined #git
11:40 msonntag joined #git
11:51 Tobbi joined #git
11:52 ertesx joined #git
11:56 neunon joined #git
11:58 leeN joined #git
11:59 stamina joined #git
12:00 Cabanossi joined #git
12:04 msonntag joined #git
12:04 neunon joined #git
12:05 sarri joined #git
12:05 sarri joined #git
12:08 Guest36461 joined #git
12:08 Derperperd joined #git
12:14 b1tchcak_ joined #git
12:16 cdg joined #git
12:18 geoid_ joined #git
12:19 almy joined #git
12:20 leah2 thinking out loud for a bit: let's say you have a tree A, and shuffle files around by renaming, so its now tree B. all blobs are in both trees, but in different dirs.
12:20 leah2 now you have commits A' A'' that modify A
12:20 leah2 how can you apply the same things to B now?
12:21 RxMcDonald joined #git
12:21 RxMcDonald So, I added *.framework to my .gitignore and then git add -A and committed and it added all the files in the framework folders, why?
12:22 mischat_ joined #git
12:22 osse leah2: by using git-apply -3 you can set up a merge-like situation and then usually git figures these things out automagically
12:22 osse leah2: if you do A' and A'' in one branch and the renaming in another it will all work out smoothly
12:22 leah2 so lets say A is a direct parent of B, then merge will just figure out the renames?
12:22 leah2 that would be pretty rad
12:22 leah2 i'll need to try it :)
12:23 RxMcDonald and now how do I ammend without all those folders?
12:24 pity joined #git
12:25 leah2 osse: indeed. fantastic :)
12:25 RxMcDonald git rm *.framework/ doesn't work
12:26 osse RxMcDonald: if .gitignore didn't apply then either the folders were already added or there's a typo in the pattern
12:27 osse RxMcDonald: i suggest you 'git reset HEAD~1' and do the commit over
12:28 kettlewell joined #git
12:30 Cabanossi joined #git
12:32 justanotheruser joined #git
12:33 RxMcDonald I fixed removing the folders with git rm --cached
12:33 mischat joined #git
12:34 ShapeShifter499 joined #git
12:36 zeroed joined #git
12:39 Hudu joined #git
12:41 neunon joined #git
12:42 brillenfux joined #git
12:43 dsdeiz joined #git
12:43 dsdeiz joined #git
12:45 djb-irc joined #git
12:45 WayToDoor joined #git
12:46 cdg joined #git
12:46 rivarun joined #git
12:48 mizu_no_oto joined #git
12:50 Felishia left #git
12:50 finalbeta joined #git
12:51 ThomasLocke_ joined #git
12:53 cqi joined #git
12:53 wget joined #git
12:58 anuxivm joined #git
12:59 ojdo joined #git
13:00 Cabanossi joined #git
13:01 boombatower joined #git
13:02 Derperperd joined #git
13:02 synthroid joined #git
13:02 anuxivm joined #git
13:05 Tobbi joined #git
13:07 flaviodesousa joined #git
13:08 sbulage joined #git
13:08 reynierpm joined #git
13:09 str joined #git
13:09 elect joined #git
13:10 finalbeta joined #git
13:11 `slikts joined #git
13:11 `slikts joined #git
13:12 bongjovi joined #git
13:13 peacememories joined #git
13:17 canuk joined #git
13:18 jmpp_ joined #git
13:19 Darcidride joined #git
13:20 manuelschneid3r joined #git
13:22 Ardethian\work joined #git
13:22 mizu_no_oto joined #git
13:23 achadwick joined #git
13:28 CheckDavid joined #git
13:29 mizu_no_oto joined #git
13:34 subhojit777 joined #git
13:35 Derperperd joined #git
13:37 yqt joined #git
13:38 mizu_no_oto joined #git
13:40 blackwind_123 joined #git
13:44 tirej joined #git
13:44 lordjancso joined #git
13:45 Cabanossi joined #git
13:45 mizu_no_oto joined #git
13:46 Raging_Hog joined #git
13:46 drbean joined #git
13:47 reynierpm joined #git
13:48 reynierpm I have a directory in /data/www and I run the following commands: cd /data/www && git pull https://github.com/repo.git this result in a folder named repo.git at /data/www => /data/www/repo.git is there any way to clone everything direct into /data/www and skip the folder creation?
13:49 tobiasvl reynierpm: do you mean git clone?
13:50 reynierpm tobiasvl, yes, sorry git clone https://github.com/repo.git
13:50 tobiasvl you can git init inside /data/www, add remote, and then fetch
13:50 osse no there is not. you can do  git init; git remote add origin https://github.com/repo.git; git fetch origin; git checkout master origin/master
13:50 tobiasvl yeah what osse said
13:51 reynierpm osse, tobiasvl thx both, gotcha
13:51 mizu_no_oto joined #git
13:51 osse BUT!!!!!
13:51 osse this assumes master is the default branch. It might not be
13:51 johnny56_ joined #git
13:54 cdown joined #git
13:59 marcogmonteiro joined #git
14:00 perlpilot joined #git
14:00 dminuoso reynierpm: Based on what your question implies:
14:00 dminuoso !deploy
14:00 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
14:00 tobiasvl good call
14:02 sarri joined #git
14:02 sarri joined #git
14:02 snowkidind joined #git
14:03 durham joined #git
14:04 melter joined #git
14:05 Tobbi joined #git
14:06 aw1 joined #git
14:09 rom1504 joined #git
14:12 jeffreylevesque joined #git
14:12 manuelschneid3r joined #git
14:12 Serpent joined #git
14:13 chrysa joined #git
14:14 mentazoom joined #git
14:15 eycsigfy joined #git
14:16 chrysa joined #git
14:16 dave0x6d joined #git
14:17 Starky joined #git
14:18 mizu_no_oto joined #git
14:18 sarri joined #git
14:18 sarri joined #git
14:19 durham joined #git
14:23 mizu_no_oto joined #git
14:23 geoid_ joined #git
14:24 mehola joined #git
14:24 WayToDoor joined #git
14:25 clmsy joined #git
14:26 denete_ joined #git
14:26 mizu_no_oto joined #git
14:29 mischat_ joined #git
14:30 todd_dsm joined #git
14:31 hobodave joined #git
14:31 jimi_ joined #git
14:31 ShekharReddy joined #git
14:34 sarri joined #git
14:34 sarri joined #git
14:34 texinwien joined #git
14:36 liamonade joined #git
14:41 leeN joined #git
14:43 ilhami joined #git
14:43 ilhami how easy is it to setup a git hook ? :)
14:44 tobiasvl ilhami: very easy to setup, but you need to write it and beware the !hook_pitfalls
14:44 gitinfo ilhami: Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).
14:45 ilhami I just want to pull whenever there is a push to my repo
14:45 ilhami that's what it should do. No more, no less
14:45 Cabanossi joined #git
14:46 Es0teric joined #git
14:47 Vampire0 tobiasvl, what is the essential problem with point 1?
14:47 jmpp joined #git
14:47 jmpp joined #git
14:47 lindenle joined #git
14:48 Vampire0 ilhami, just as point 3 said, don't do a pull in a script. As soon as you have conflicts or a rewritten history, pull (i. e. merge or rebase) needs manual ineraction that you cannot provide in a script. If you want to pull on push, this sounds like !deploy
14:48 gitinfo ilhami: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
14:48 ikelso joined #git
14:49 TomyLobo joined #git
14:49 theoceaniscool joined #git
14:50 geoid_ joined #git
14:51 Dougie187 joined #git
14:51 nowhereman joined #git
14:53 mizu_no_oto joined #git
14:53 e14 joined #git
14:57 mentazoom joined #git
14:57 nowhereman joined #git
14:57 manuelschneid3r joined #git
15:01 nickabbey joined #git
15:02 Snugglebash joined #git
15:04 e14 joined #git
15:06 Tobbi joined #git
15:06 mischat joined #git
15:09 mizu_no_oto joined #git
15:09 ash_workz joined #git
15:09 ghoti joined #git
15:11 geoid_ joined #git
15:12 zivester joined #git
15:12 kpease joined #git
15:12 kpease_ joined #git
15:14 rwb joined #git
15:17 PinkPonyOfDeath joined #git
15:17 nickabbey joined #git
15:19 nickabbey joined #git
15:21 PinkPonyOfDeath hello. i have just pushed a repo to bitbucket and wanted to clone it on another machine using "git clone git@bitbucket.org:username/name.git" (with my credentials of course). it says "cloning to 'name' ..." and i get the command promt...no directory has been created, nothing has been cloned. the repo is definetly not empty and the master branch is the only one in there. what could be the problem?
15:22 seni joined #git
15:22 seni is it possible to check the checkout and pull history of a local git repo?
15:23 _ikke_ seni: mostly the reflog (man git reflog)
15:23 gitinfo seni: the git-reflog manpage is available at http://jk.gs/git-reflog.html
15:24 albel727 joined #git
15:25 peepsalot joined #git
15:25 texinwien_ joined #git
15:27 seni hm okay I can see the checkout commands with `git reflog` which are associated with a different HEAD, is there some way to see timestamps too?
15:27 mizu_no_oto joined #git
15:28 _ikke_ seni: try git log -g (which is also the reflog but then differently formatted)
15:28 GT4066 joined #git
15:28 nckpz joined #git
15:29 [0xAA] joined #git
15:30 douglascorrea joined #git
15:32 Ediz joined #git
15:33 diogenese joined #git
15:34 ecuanaso joined #git
15:35 jokester joined #git
15:37 mizu_no_oto joined #git
15:38 GodGinrai joined #git
15:39 str joined #git
15:40 Murii joined #git
15:41 geoid_ joined #git
15:42 BSaboia joined #git
15:45 mischat_ joined #git
15:46 mischat_ joined #git
15:46 rivarun joined #git
15:47 e14 joined #git
15:49 chll_ joined #git
15:50 Es0teric joined #git
15:50 Oatmeal joined #git
15:51 LionsMane joined #git
15:53 mahpoul22 joined #git
15:54 a_thakur joined #git
15:54 Tobbi joined #git
15:54 Macaveli joined #git
15:55 dashwood joined #git
15:55 JeroenT joined #git
15:56 ToBeCloud joined #git
15:56 dashwood left #git
15:57 dreiss joined #git
15:58 Darren_ joined #git
16:00 Cabanossi joined #git
16:03 shinnya joined #git
16:04 Gloomy joined #git
16:04 mischat joined #git
16:05 Snugglebash joined #git
16:05 douglascorrea joined #git
16:05 m4sk1n joined #git
16:13 Derperperd joined #git
16:14 jagob joined #git
16:15 mischat joined #git
16:15 Emperor_Earth_ joined #git
16:16 reynierpm is this the right way to clone a repo without using the clone command: "git init && git remote add origin https://github.com/pyrocms/pyrocms.git && git fetch origin && git checkout origin/master", if so why is not checking out any files?
16:18 PinkPonyOfDeath is there any way to show pull requests on the command line? cannot seem to find what i am looking for in the documentation
16:18 ToxicFrog PinkPonyOfDeath: the command line of what, git? PRs are a github thing (or more generally a team workflow thing), not a git thing.
16:19 JeroenT joined #git
16:19 ToxicFrog !github
16:19 gitinfo 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)
16:19 ToxicFrog (I wonder if someone's written a git-hub extension to interact with github PRs from the command line)
16:19 PinkPonyOfDeath ToxicFrog: i see, was just wondering because you can do a 'git request-pull'
16:19 PinkPonyOfDeath from git command line
16:19 brent__ joined #git
16:20 ToxicFrog PinkPonyOfDeath: have you actually tried that? It outputs a form letter that you can send to the other dev via email.
16:20 ToxicFrog The intended use is something like 'git request-pull <stuff> | mail <address>'
16:20 PinkPonyOfDeath ToxicFrog: ah, that makes sense. thank you
16:20 ToxicFrog (which is, AIUI, how linux kernel development coordinates pulls -- that's what git was originally developed for)
16:21 eroussel joined #git
16:21 iron_houzi What is the best way to apply the diff between branch-foo and branch-bar onto branch-baz?
16:22 PinkPonyOfDeath i am just trying to figure out how to best use git and teach my friends and work mates to use it...so i was just trying the request-pull and wondering how it should be used
16:22 ToxicFrog iron_houzi: git cherry-pick, probably
16:23 subhojit777 joined #git
16:23 ToxicFrog probably cherry-pick -n
16:23 ToxicFrog (since that will squash all the commits into a single not-yet-committed change)
16:23 matsaman joined #git
16:25 raspado joined #git
16:25 hasc joined #git
16:25 strugee joined #git
16:25 mehola joined #git
16:25 tcorneli joined #git
16:25 Tobbi joined #git
16:26 hasc_ joined #git
16:27 mizu_no_oto joined #git
16:27 purpleidea joined #git
16:27 purpleidea i almost always do "s" (split) when using `git add -p`... Is there an option or flag to cause interactive mode to always split?
16:28 reynierpm guys any help? I am stuck
16:28 jabberwock joined #git
16:28 roelmonnens joined #git
16:29 sarbs joined #git
16:29 jabberwock Hi. :) Is "--" synonymous with "HEAD" in `git checkout` ? And where in the manual might I find this?
16:29 osse reynierpm: !repro
16:29 gitinfo reynierpm: [!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
16:29 osse jabberwock: !--
16:29 gitinfo jabberwock: [!dashes] Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"
16:29 osse it is unrealted to HEAD
16:30 jabberwock Oh. Thanks. Wondering if I should use HEAD or -- for this show&tell. Showing how you can see all files controlled by git by obtaining the index binary file when directory listing is enabled, or recursively download the whole thing if it's disabled
16:31 jabberwock (for web-apps that are ignorantly deployed with their .git repo public-facing)
16:31 jabberwock git checkout HEAD . and git checkout -- . seem to do the same thing
16:31 iron_houzi ToxicFrog: from branch-baz, I did: `git cherry-pick -n branch-foo branch-bar` -- this didn't work as intended, I think only the changes from branch-foo got applied .. I am left with having to resolve merge conflicts, so can I abort with the usual `git merge --abort`? .. and should I rather do `git cherry-pick branch-foo..branch-bar` ?
16:32 synthroid joined #git
16:32 Es0teric joined #git
16:32 jabberwock and I'm obviously missing some fundamental knowledge.
16:32 TomyLobo jabberwock, you can also download every single file through the repo, even if they deleted or modified it for the production instance :)
16:32 netj joined #git
16:32 madewokherd joined #git
16:32 jabberwock Oops I got enabled/disabled reversed there
16:32 TomyLobo basically you could just do git clone http://whatever.com/.../.git
16:32 ToxicFrog iron_houzi: I don't remember the exact syntax you're going to need to get everything from bar but not foo into the cherry-pick, but "man git-cherry-pick" has some examples
16:32 gitinfo iron_houzi: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
16:32 jabberwock depending on how it's read
16:33 jabberwock TomyLobo: This isn't quite the same though. I can't clone these over http
16:33 TomyLobo why not?
16:33 iLembus joined #git
16:33 tubaman joined #git
16:33 ToxicFrog jabberwock: they do the same thing because "what commit" defaults to HEAD, and the -- is optional if the difference between paths and branches is unambiguous
16:33 jabberwock I have to wget or else i can `mkdir tmp && cd tmp && git init && wget -r https://site.tgt/.git/ index && mv index .git/ && git ls-files -s -n`
16:34 mizu_no_oto joined #git
16:34 ToxicFrog So "git checkout HEAD ." and "git checkout -- ." are both shorthand for "git checkout HEAD -- ."
16:34 jabberwock ToxicFrog: Ah! Thank you :)
16:34 TomyLobo one is a shorter shorthand
16:34 iron_houzi ToxicFrog: ahh.. OK, thank you for your help.
16:34 jabberwock TomyLobo: I honestly don't know the "why". It isn't a clone-able directory
16:35 TomyLobo have you tried?
16:35 peepsalot joined #git
16:36 jabberwock fatal: repository 'https://site.tgt/.git/' not found
16:36 TomyLobo jabberwock, https://git-scm.com/book/en/v2/Git-Intern​als-Transfer-Protocols#_the_dumb_protocol this is what git tries there
16:36 jabberwock It's at the web root is the "why" I'm guessing
16:37 jabberwock tried with just site.tgt as well
16:37 jabberwock This isn't a .git file. It's the .git metadata folder
16:38 TomyLobo jabberwock, it's probably missing that info/refs file...
16:38 TomyLobo can you see if you can retrieve that?
16:38 grawity there's always GIT_CURL_VERBOSE=1 to see what it's trying to fetch
16:38 jabberwock Yeah /.git/info/refs is 404
16:39 jabberwock thanks! checking that out
16:39 ToxicFrog iron_houzi: it's definitely possible because I've done it before, but not often enough to remember the exact incantation that cherry-pick wants.
16:39 TomyLobo the more problematic part would be objects/info/packs
16:39 grawity info/refs is required for the dumb-http transport; it's generated by `git update-server-info`, usually by hooks/post-update or something
16:39 ToxicFrog Depending on what the history looks like, "git merge --squash" might also be a possibility, but that could easily end up pulling in additional commits you don't want depending on when things branched off other things.
16:40 jabberwock Hmm it says 404
16:40 jabberwock yet I can download /.git/index
16:40 grawity the index is completely useless for cloning
16:40 TomyLobo grawity, he's analyzing the page of someone who left their .git in their web root. to see how exploitable it is before telling them
16:40 jabberwock That is GET /info/refs?service=git-upload-pack
16:40 grawity ah in that case
16:40 grawity try .git/packed-refs
16:41 grawity or .git/refs/heads/
16:41 mizu_no_oto joined #git
16:41 grawity or .git/logs/HEAD
16:41 jabberwock Just the index file was enough to find an otherwise undisclosed file with a SQLi vuln which is kinda cool on my part
16:41 jabberwock Yep I can get those
16:42 grawity can you access .git/objects/info/packs?
16:42 jabberwock There doesn't seem to be a way to "clone" it though. With directory indexing I can do a wget -r and then git checkout HEAD . to get the source
16:42 jabberwock When disabled I can only glean the files from index
16:42 WayToDoor joined #git
16:42 Snugglebash joined #git
16:42 jabberwock No. That is 404
16:42 TomyLobo wait, how do you get the source from just the index file?
16:43 jabberwock TomyLobo: I don't. I can see the files controlled by it though
16:43 jabberwock I can only get the source if directory listing is enabled which allows wget -r to work
16:43 TomyLobo yeah that makes more sense ^^
16:43 jabberwock If I could find a way to get the source with directory listing disabled then it would probably be a CVE against git
16:44 TomyLobo why against git?
16:44 TomyLobo dont put your repo into your web root, simple as that
16:44 jost joined #git
16:44 jabberwock Because it doesn't seem that there should be a way to know the hash parts of object indexes and packs
16:44 jabberwock Yes that is the ultimate remediation :)
16:45 jabberwock but for our web-app pentesters I'm just putting together stuff  I've discovered during the last 2 netsec engagements
16:45 TomyLobo *cough*startups*cough*
16:46 jabberwock Hardly :P
16:46 jccn joined #git
16:46 zivester joined #git
16:46 TomyLobo heh
16:46 TomyLobo worse?
16:47 jabberwock I don't understand what that means
16:47 jabberwock We're the ones discovering this stuff and reporting to the clients
16:47 TomyLobo you said they were hardly startups... worse than startups? :)
16:48 jabberwock Oh they? They're big. Like really big
16:48 griffindy joined #git
16:48 TomyLobo mkay
16:48 mizu_no_oto joined #git
16:48 jorjor joined #git
16:49 jabberwock And the bigger the company the bigger the chance of having orphaned systems lying around just waiting for the wrong person to discover them
16:49 Darren_ joined #git
16:49 jabberwock sorry if this is off topic.
16:49 pbrewczynski joined #git
16:49 Macaveli joined #git
16:50 hhee joined #git
16:50 KevinDF joined #git
16:51 bgerber joined #git
16:51 strlng joined #git
16:51 TomyLobo grawity, how does git find the packs locally? readdir?
16:51 mizu_no_oto joined #git
16:52 multi_io joined #git
16:53 TomyLobo i'm assuming this is a clone and thus it's all pack files... you can, however, try to look up the HEAD reference
16:53 raspado joined #git
16:54 jabberwock .git/HEAD has "ref: refs/heads/master"
16:54 jabberwock which is 404
16:54 TomyLobo hrm
16:54 jabberwock wait no it's not.
16:54 jabberwock Sorry. That was a different site.
16:54 jabberwock That has a hash in it
16:54 satifant joined #git
16:54 TomyLobo try to look that up as described here https://git-scm.com/book/en/v2/Git-Intern​als-Transfer-Protocols#_the_dumb_protocol
16:54 jabberwock thanks!
16:55 TomyLobo probably wont work though
16:55 mizu_no_oto joined #git
16:55 TomyLobo like i said, it's probably all contained in pack files
16:55 jabberwock yeah
16:56 xissburg joined #git
16:56 anddam joined #git
16:56 anddam hello
16:56 TomyLobo and the names of those seem hard to guess
16:57 jabberwock TomyLobo: exactly. Something like 1e24 possibilities which is totally impractical
16:57 prawnzy joined #git
16:57 strlng I’m trying to clone a repo that is using git-lfs. I want to just get the repo and pointers, not the actually files, because I’ve got a poor internet connection today. I can’t seem to find a way to tell git to do that though.
16:57 anddam git log upstream/master..mybranch    shows only one commit and since I only made the one it's fine to push, is that correct'
16:57 anddam s/'$/?
16:57 e14 joined #git
16:57 TomyLobo string simply use git clone and not git lfs clone... i think
16:58 elsevero joined #git
16:58 anddam can I push   mybranch   to  upstream master or should I merge locally in master before pushing?
16:59 seni joined #git
16:59 TomyLobo anddam, ask the person who devised your workflow :)
16:59 mizu_no_oto joined #git
16:59 thiago git allows you to do both
16:59 strlng TomyLobo I’ve tried that. It’s still grabbing recent files.
16:59 PinkPonyOfDeath left #git
17:00 TomyLobo strlng, odd... is there a pre-existing repo by the same name maybe?
17:01 djb-irc joined #git
17:01 strlng TomyLobo I deleted the repo previously. Though git wouldn’t clone in to an existing repo anyway wouldn’t it?
17:01 m0viefreak joined #git
17:01 TomyLobo i dont know... it might
17:01 TomyLobo oh one thing
17:01 TomyLobo did you configure git-lfs globally?
17:01 TomyLobo check git config --global -e
17:01 TomyLobo if so, comment it out while cloning
17:02 Snugglebash joined #git
17:02 anddam thiago: is the current branch the one pushed?
17:02 TomyLobo anddam, depends on your settings
17:02 anddam TomyLobo: I haven't got a structured workflow
17:02 TomyLobo git push $remote $branch
17:03 anddam TomyLobo: is that $branch local or remote?
17:03 TomyLobo (not literally)
17:03 TomyLobo anddam, ideally, both :)
17:03 anddam ok, but I'm currently in a branch named "somebranch" because I was suggested not to work in master
17:03 strlng TomyLobo yes, and i set some lfs options tht I thought would help: [lfs]
17:03 strlng fetchrecentrefsdays = 0
17:03 strlng fetchrecentremoterefs = 0
17:03 TomyLobo before the push, it has to exist locally (of course)
17:03 strlng fetchrecentcommitsdays = 0
17:04 TomyLobo and after the push it's supposed to exist remotely (of course)
17:04 anddam now I'd like to push to master, and avoid the big messy screwup I already did where I duplicated commits
17:04 anddam TomyLobo: I don't want "somebranch" to exist on remote tho', I'd like the changes to be on master
17:04 TomyLobo anddam, why not push to somebranch on the remote side in order to avoid confusion?
17:04 TomyLobo i think that's what they meant
17:05 anddam and then merge?
17:05 TomyLobo strlng, can you pastebin the file?
17:05 strlng found something that may help https://github.com/git-lfs/git-lfs​/issues/227#issuecomment-173414717
17:05 TomyLobo anddam, i dont know your workflow
17:05 anddam TomyLobo: that makes two of us
17:05 mizu_no_oto joined #git
17:06 thiago anddam: it's both local and remote: it pushes the local branch $branch to the remote branch $branch
17:06 e14 joined #git
17:06 strlng TomyLobo http://pastebin.com/MUEsvGWS
17:06 TomyLobo strlng, that should work
17:07 purpleidea i almost always do "s" (split) when using `git add -p`... Is there an option or flag to cause interactive mode to always split?
17:07 Atm0spher1c joined #git
17:07 finalbeta joined #git
17:07 TomyLobo strlng, the lfs filter has to go. it makes git filter everything it checks out
17:07 Gsham joined #git
17:07 anddam thiago: and how does it work in order to push local branch 'foo' to remote 'bar'?
17:07 TomyLobo through git-lfs
17:07 strlng TomyLobo ah, gotcha
17:07 geoid_ joined #git
17:08 jccn joined #git
17:09 anddam TomyLobo: from what I read on suggested workflow there's no mention of separate branches
17:10 Es0teric joined #git
17:12 Singmyr joined #git
17:13 denisMone joined #git
17:13 s2013 joined #git
17:13 duderonomy joined #git
17:14 madewokherd anddam: git push origin foo:bar
17:14 anddam thanks
17:14 e14 joined #git
17:14 gigq joined #git
17:15 anddam I rebased somebranch on master, that is I checked out master and then ran   'git rebase somebranch'
17:15 cha18 joined #git
17:15 brent__ joined #git
17:15 anddam now the change I added in somebranch should be at the end of the history, right?
17:15 GodGinrai anddam: that's not rebasing somebranch on master
17:16 GodGinrai anddam: that's rebasing master on somebranch
17:16 djb-irc joined #git
17:16 anddam I'm not sure which one should I've been doing
17:17 anddam also i read "If <branch> is specified, git rebase will perform an automatic git checkout <branch> before doing anything else." but I see the active branch remained master, not somebranch
17:18 anddam if a 'git checkout <branch>' was performed I'd expect <branch> to be the active branch, isn't that right?
17:18 GodGinrai anddam: that's because you specified <upstream> not <branch>
17:18 GodGinrai anddam: read the example with the diagram later in the docs
17:19 anddam yep, just figured reading synopsis
17:19 anddam can I "undo" the wrong rebase?
17:19 GodGinrai you can, but I don't know what it actually did to your master branch, so I wouldn't know what needs to be done to correctly undo it
17:20 anddam GodGinrai: what info can I provide to help you help me?
17:20 anddam I may have actual shell log at this point
17:21 GodGinrai yea, if you can show what the output you got from the rebase command was
17:21 GodGinrai and also, check `git diff origin/master`
17:23 NaN joined #git
17:24 mischat_ joined #git
17:24 anddam https://gist.github.com/anddam/5​8d86bb3cc457624888205b8f15de705
17:25 anddam step by step description: checked the current branch
17:25 anddam checked that only one commit was going to be pushed upstream
17:26 NaN I created a branch from master and started to  work, but now I know I should have create my branch fromo another one, how do I put only my changes on the new branch (from the correct one)?
17:26 anddam I don't know why there's no the checkout to xonsh-update- branch
17:26 anddam GodGinrai: at L29 checked out master, then rebased
17:27 mizu_no_oto joined #git
17:27 nickabbey joined #git
17:28 anddam GodGinrai: I see the rebase reapplied 5 commits, so I checked log -6
17:28 GodGinrai NaN: so you have master, A, and B.  B is created from master, but it should have been created from A?
17:28 buzzLightBeer joined #git
17:28 tcorneli joined #git
17:28 anddam btw why is my commit 4e2dad4 shown in 6th position even if it's chronologically the latest?
17:29 tyreld joined #git
17:31 grawity the log only shows author time by default; not the time it was committed
17:31 grawity e.g. old patches applied via `git am` might be from a year ago
17:31 grawity use --graph --format=fuller
17:31 ResidentBiscuit joined #git
17:34 anddam ok, so the time is when my local copy "learned" about those commits, right?
17:34 grawity no
17:35 grawity "author" time is when the commit was first made -- it persists through rewrites, it's copied when you make a .patch from the commit, or when you cherry-pick it
17:35 grawity "committer" time is when the commit was last edited -- it's updated on apply/cherry-pick/rewrite/etc.
17:35 NaN GodGinrai: That's right
17:35 grawity same with the author/committer names, too
17:36 anddam grawity: when you said log only showed author time did you imply that was the sorting criterion as well?
17:36 djb-irc joined #git
17:36 anddam grawity: or does it show only author time, but that's unrelated to the order in which I see commits?
17:37 geoid_ joined #git
17:37 iLembus joined #git
17:37 grawity I don't quite remember what sort order is the default; probably topological (latest->parent->parent->parent)
17:37 anddam I ask as I expected that a commit with a later author time and that had just been rebased (or so I hoped) would appear as last one and so first in order in log's output
17:37 anddam ok
17:37 grawity but, as you can see there are at least *three* orders
17:38 anddam back to my previous question, how do I revert the wrong rebase?
17:38 grawity you don't "revert" it, you have to use `git reset` to go back to the old history
17:38 masuberu joined #git
17:38 grawity use `git reflog` / `git reflog master` if you don't remember the "good" commit ID
17:38 grawity the reflog keeps track of rebases and stuff
17:39 GodGinrai NaN: that's what rebase is for.  from branch B, use `git rebase A`
17:43 tubaman joined #git
17:44 anddam grawity: I figure it's HEAD@{7} at https://gist.github.com/anddam/f​27aea857be7ee3fed0aca9ee1275260
17:44 grawity then `git reset --hard` to it
17:45 purpleidea left #git
17:46 anddam done
17:46 anddam now i have a branch with a single commit that I want to rebase on master
17:47 anddam that is I'd like that one commit to go at the end of master's linear history
17:48 grawity was it originally based on master too?
17:48 grawity check out that branch, then do `git rebase master`
17:48 grawity (or, if that fails... it's only one commit, so you could create a new branch and cherry-pick that commit by hand)
17:49 Gsham_ joined #git
17:49 sargas joined #git
17:50 XenophonF joined #git
17:51 dreiss joined #git
17:53 anuxivm left #git
17:54 BrownBear joined #git
17:55 mischat joined #git
17:56 hobodave joined #git
17:56 Ice_Strike2 joined #git
17:58 mizu_no_oto joined #git
17:59 Singmyr joined #git
18:00 overlord_tm joined #git
18:01 mizu_no_oto joined #git
18:01 nickabbey joined #git
18:02 durham joined #git
18:03 e14 joined #git
18:03 anddam yes it was based on master,
18:03 Blendify left #git
18:03 anddam branched, made a single commit
18:04 NaN God but why if I have in B things from master that aren't in A?
18:04 NaN GodGinrai: ^
18:04 anddam now i'd like to push to master, but rebasing on other people's commits
18:04 barteks2x Maybe a dumb question, but somehow on my windows machine I don't need to type my github password to push, and yet my ssh key on github is last used 9 months ago. How is that possible? Does git have something to remember my password?
18:04 jaafar joined #git
18:05 GodGinrai NaN: as long as the commits in B are all that you care about (and not the ones from master) it doesn't matter
18:05 barteks2x Last time I touched the setup on that computer was probably 2+ years ago so I don't remember
18:05 GodGinrai NaN: rebase will take all the commits from B that were not part of master, and reapply them on top of A instead
18:06 publio joined #git
18:06 e14 joined #git
18:08 bilb_ono joined #git
18:10 lindenle joined #git
18:10 Starky joined #git
18:10 griffindy joined #git
18:11 mizu_no_oto joined #git
18:12 durham joined #git
18:13 hasc joined #git
18:15 elsevero joined #git
18:15 KV joined #git
18:15 spacelord_ joined #git
18:16 ihradek joined #git
18:17 Gsham joined #git
18:17 mischat joined #git
18:18 chipotle joined #git
18:19 eroussel joined #git
18:19 mizu_no_oto joined #git
18:19 Doginal joined #git
18:21 e14 joined #git
18:22 mizu_no_oto joined #git
18:22 Hudu joined #git
18:23 NaN GodGinrai: nice... thanks c:
18:26 jstimm joined #git
18:26 e14 joined #git
18:27 sathed joined #git
18:27 GodGinrai NaN: yw
18:27 Lauven joined #git
18:28 nidr0x joined #git
18:29 a_thakur joined #git
18:30 Cabanossi joined #git
18:30 sathed I got something funky going on... I'm using 3 different git servers (all over SSH): Gitolite, Gitblit, and Gitlab. Using my generated SSH keys, I can clone and push to Gitblit and Gitolite just fine. However, I'm unable to with Gitlab. Every time I try to clone or push, I get an error about invalid SSH keys (yes, I've uploaded my public key correctly). However, if I run `ssh-agent $(ssh-add ~/.ssh/id_rsa; <git command here>)`
18:31 iLembus_ joined #git
18:31 HedgeMage barteks2x: Windows tends not to use the standard toolchains...could you be using something there that's authed with a token instead of SSH?
18:31 nickabbey joined #git
18:31 mizu_no_oto joined #git
18:31 NaN GodGinrai: I did it and now I have a conflict with a file from master, so it does matter :c
18:32 matsaman ugh, would someone help me please
18:32 matsaman I need to revert the two last commits for my remote
18:33 matsaman I want it like they never happened, or as close to it as possible
18:33 HedgeMage barteks2x: You could have authorized it via OAUTH2, or by manually getting a "personal access token" from the web interface on github.
18:33 barteks2x I have no idea how it works on windows, but it works and I was wondering if it's safe at all
18:34 HedgeMage sathed: some servers are more tolerant than others of extraneous whitespace at the end of an SSH key.  Please make sure there is NO WHITESPACE OF ANY KIND at the end of your pubkey and try again.
18:34 Lauven joined #git
18:34 sathed I'll check. HedgeMage
18:34 HedgeMage barteks2x: depends on what's going on.  I can't see your system to know what's happening.  If you saved your actual github user password in there, instead of one of the other things I've mentioned, it's quite unsafe.
18:35 barteks2x I set it up probably 2+ years ago and only recently came back to using that system. And I was very surprizedwhen I didn't need to typemy password
18:35 matsaman bah think I got it, sorry & thanks =)
18:36 HedgeMage barteks2x: change your user password and see if it breaks :D
18:36 GodGinrai NaN: you have a conflict with a file from master?  Can you elaborate?
18:36 barteks2x actually I might have different password when I set it u
18:37 barteks2x so I'm almost sure it's not saved in plaintext
18:37 HedgeMage barteks2x: then it's probably a token or something safer
18:37 sathed HedgeMage: No white space. Everything looks okay...
18:37 kballou joined #git
18:38 adino joined #git
18:38 hwrdprkns joined #git
18:38 rominronin joined #git
18:38 Gloomy joined #git
18:39 thiago joined #git
18:39 NaN GodGinrai: yes, a file that is from master and is not in branch A (the branch I should have checkout from)
18:40 douglascorrea joined #git
18:41 duderonomy joined #git
18:42 al-damiri joined #git
18:42 hagridaaron joined #git
18:43 douglascorrea left #git
18:44 Es0teric joined #git
18:45 gugah joined #git
18:47 GodGinrai NaN: there should only be a problem if B has modifications to that file in its commits
18:49 NaN GodGinrai: it doesn't, I'm pretty sure cause B has only 2 new commits with my code
18:49 Hedgework sathed: Hmm.  Is there any chance that your ssh key was created on a UTF-8-everywhere system and the system running the Gitlab instance doesn't know what UTF-8 is, or that your SSH key is using a newer format than the gitlab server knows about, or an older one than it accepts?
18:51 tang^ joined #git
18:51 Hedgework sathed: Any of these situations is unusual but possible.
18:52 Hedgework sathed: There's also the more-likely possibility that you had a mispaste or similar and just need to re-upload, but I assumed you tried that already.
18:53 Hedgework sathed: Also, I just realized I switched machines when talking to you... I'm HedgeMage, just from my work machine...I'm in the middle of conference prep so I'm swapping back and forth a lot right now. Sorry for any confusion :)
18:55 NaN GodGinrai: Maybe I should checkout -b from A and do a cherry pick or something, what do you think?
18:56 GodGinrai NaN: you could try that.  Rebase should have worked, tho'.  I still think one of your commits in B does something to that file
18:56 psyb0t_ joined #git
18:58 leah2 joined #git
18:58 Oatmeal joined #git
18:59 overlord_tm joined #git
18:59 syg__ joined #git
18:59 Nokurn joined #git
19:02 Sasazuka joined #git
19:02 Limes_ joined #git
19:03 Olipro joined #git
19:07 tyreld joined #git
19:07 pypypypypy joined #git
19:07 thiago joined #git
19:09 Disgeae joined #git
19:13 hecliunyx joined #git
19:16 svm_invictvs joined #git
19:16 dreiss joined #git
19:17 cdown joined #git
19:17 mischat joined #git
19:17 mizu_no_oto joined #git
19:18 mda1 joined #git
19:19 Es0teric joined #git
19:20 inflames joined #git
19:20 syg_ joined #git
19:20 kulelu88 joined #git
19:20 BackEndCoder joined #git
19:22 disconnect_me joined #git
19:23 rewt`` joined #git
19:24 mizu_no_oto joined #git
19:25 Xionkana joined #git
19:26 vuoto joined #git
19:27 Kevin_ joined #git
19:29 SwiftMatt joined #git
19:30 anddam how do apply a commit from a branch in another branch?
19:30 Cabanossi joined #git
19:30 radens left #git
19:30 perlpilot anddam: cherry pick?
19:31 Vampire0 anddam, man git cherry-pick
19:31 gitinfo anddam: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
19:32 anddam I think this describes what I'm looking for https://gist.github.com/anddam/b​a60bee6ad18d7ef02a02d95cd248f62
19:32 anddam took the example from git-rebase(1)
19:32 Cabanossi joined #git
19:33 kyan joined #git
19:33 anddam I'd like to get rid of the starting branch and be left with master only
19:33 gajus joined #git
19:34 Darren_ joined #git
19:34 Cabanossi joined #git
19:36 tubbo joined #git
19:36 tubbo riddle me this
19:36 perlpilot anddam: after the rebase, git-reset master to be the same as topic (probably reset --hard)  then, presumably, delete the topic branch
19:37 codemann joined #git
19:37 tubbo we're using a bastardized version of git-flow over here and i just encountered a situation when git thinks the branch is entirely up to date when it's not
19:37 tubbo well, at least it's not what i expect
19:38 adino joined #git
19:38 _ikke_ Right
19:38 _ikke_ git is not often wrong about these things
19:38 rominronin joined #git
19:39 codemann- joined #git
19:41 mizu_no_oto joined #git
19:42 Vampire0 anddam, `git branch -M master` renames the current branch to master, discarding existing master if it already exists
19:42 miczac joined #git
19:43 e14 joined #git
19:46 user51_ joined #git
19:46 Jackneill joined #git
19:47 nd joined #git
19:47 jnavila joined #git
19:47 miczac_ joined #git
19:48 bill99 joined #git
19:49 nickabbey joined #git
19:50 codemann joined #git
19:51 Zoxc joined #git
19:53 Hudu joined #git
19:57 mizu_no_oto joined #git
19:58 grawity joined #git
19:59 Blendify joined #git
20:00 b100s joined #git
20:00 Blendify is it normal to start spelling "get" "git"?
20:02 GodGinrai lol
20:02 brent__ joined #git
20:04 mizu_no_oto joined #git
20:04 Dhxb joined #git
20:05 tobiasvl tubbo: !repro
20:05 gitinfo tubbo: [!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
20:05 jacen915 joined #git
20:06 jacen915 Hi all, looking to see if there’s a way to revert parts of a commit? ideally something like a `git revert -p <commit>`
20:06 mischat joined #git
20:06 cr34ton joined #git
20:07 ecuanaso joined #git
20:07 grawity git revert -n <commit>; git reset -p (throw away unneeded parts); commit what's left
20:07 tobiasvl jacen915: you can revert --no-commit, add the changes you want, and then commit
20:08 tobiasvl yeah reset too is a good idea :P
20:08 jacen915 awesome thanks!
20:09 LionsMane joined #git
20:09 hecliunyx joined #git
20:11 gugah joined #git
20:11 Noldorin joined #git
20:12 Xionkana joined #git
20:12 Kevin__ joined #git
20:13 durham joined #git
20:13 Derperperd joined #git
20:14 durham joined #git
20:16 Blendify left #git
20:17 sarri joined #git
20:17 sarri joined #git
20:18 jimi_ joined #git
20:18 mizu_no_oto joined #git
20:20 ecuanaso joined #git
20:22 adino joined #git
20:23 b100s joined #git
20:24 Kevin_ joined #git
20:31 acetakwas joined #git
20:32 jeffreylevesque_ joined #git
20:32 overlord_tm joined #git
20:33 diogenese joined #git
20:35 brent__ joined #git
20:35 chipotle joined #git
20:36 bket joined #git
20:37 denisMone joined #git
20:39 mizu_no_oto joined #git
20:40 nilg joined #git
20:40 ecuanaso joined #git
20:44 aidalgol joined #git
20:44 jccn joined #git
20:45 ShalokShalom joined #git
20:46 berndj joined #git
20:46 vuoto joined #git
20:47 fahadash joined #git
20:47 jwest joined #git
20:50 berndj joined #git
20:51 griffindy joined #git
20:54 mizu_no_oto joined #git
20:54 elsevero joined #git
20:55 anddam Vampire0: doesn't looks what I'd like
20:55 synthroi_ joined #git
20:55 anddam perlpilot: if I'm on topic and 'rebase master' isn't the added commit only in topic?
20:56 anddam perlpilot: I mean wouldn't git reset master lose the commits in topic?
20:57 berndj joined #git
20:59 diogenese joined #git
21:02 HaywardGB joined #git
21:02 armyriad joined #git
21:02 relipse joined #git
21:02 relipse how do i see the author of all the lines of a file
21:02 grawity tig blame file.c
21:02 kadoban relipse: Sounds like git blame
21:02 grawity git blame / gitk blame / Github's "Blame" mode also work
21:04 relipse git blame worked thanks
21:05 jacen915 joined #git
21:07 armyriad joined #git
21:08 armyriad joined #git
21:09 rominronin joined #git
21:09 mizu_no_oto joined #git
21:10 griffindy joined #git
21:10 Xionkana joined #git
21:13 nickabbey joined #git
21:15 Synthead joined #git
21:16 `mx joined #git
21:18 e14 joined #git
21:19 mizu_no_oto joined #git
21:19 Kevin__ joined #git
21:19 parasite_ joined #git
21:21 relipse i accidenatlly did git add :/ how do i reset back to my brnach
21:21 Derperperd joined #git
21:23 kadoban relipse: read the output of 'git status'
21:25 cr34ton joined #git
21:25 HaywardGB (use "git checkout -- <file>..." to discard changes in working directory)
21:25 Gsham joined #git
21:26 Gloomy joined #git
21:26 pasadinhas joined #git
21:29 e14 joined #git
21:29 przemoc86 joined #git
21:30 Cabanossi joined #git
21:32 askb joined #git
21:32 davimore joined #git
21:33 texinwien_ joined #git
21:34 jccn joined #git
21:35 elsevero_ joined #git
21:38 cr34ton_ joined #git
21:38 mizu_no_oto joined #git
21:39 adino joined #git
21:40 jast joined #git
21:43 adamm joined #git
21:43 frobnic joined #git
21:43 przemoc joined #git
21:43 przemoc joined #git
21:43 kyan joined #git
21:44 cyan__ joined #git
21:46 chardan joined #git
21:47 scorphus joined #git
21:47 mizu_no_oto joined #git
21:49 jeffreylevesque joined #git
21:50 chardan joined #git
21:51 mizu_no_oto joined #git
21:51 safe joined #git
21:52 Xionkana joined #git
21:52 notebox joined #git
21:54 canuk joined #git
21:55 glebihan_ joined #git
21:56 anddam push --dryy-run is printing out ony         3ee8219..55abd2c  master -> master
21:56 toodjr joined #git
21:56 WifiBrain joined #git
21:56 anddam that means I'm only adding the one 55abd2c commit, is that correct?
21:57 Dougie187 If the commit before it is 3ee8219, yes
21:58 __builtin_ybden joined #git
21:58 chardan joined #git
21:59 Walex joined #git
22:00 przemoc joined #git
22:00 anddam mmm I thought it was but I see newer commit at tory)
22:00 Cabanossi joined #git
22:00 anddam wrong paste
22:00 anddam https://github.com/macports/m​acports-ports/commits/master
22:00 e14 joined #git
22:01 anddam actually I don't even know why that was in clipboard
22:01 Alienpruts joined #git
22:01 dfas joined #git
22:02 mizu_no_oto joined #git
22:06 warz joined #git
22:11 bl0w3d_0ut joined #git
22:16 mda1 joined #git
22:17 jacen915 joined #git
22:17 cstratak joined #git
22:18 cdg joined #git
22:19 platzhirsch joined #git
22:21 platzhirsch joined #git
22:22 platzhirsch git submodule update --init --remote --rebase intiailizes submodule repos and checks them out at the latest commit but it's still in a detached HEAD state
22:22 gingin joined #git
22:22 platzhirsch is there a way to get it to show to master directly
22:22 Hudu joined #git
22:23 dave0x6d joined #git
22:26 ikelso joined #git
22:28 cdg joined #git
22:28 ybden joined #git
22:30 macivy joined #git
22:33 nikow joined #git
22:34 brent__ joined #git
22:38 Hudu joined #git
22:39 Derperperd joined #git
22:39 theoceaniscool joined #git
22:41 rominron_ joined #git
22:41 KV joined #git
22:42 dsdeiz joined #git
22:42 diogenese joined #git
22:44 jason237 joined #git
22:44 AfroThundr joined #git
22:44 Toordog- joined #git
22:45 bl0w3d_0ut joined #git
22:47 Toordog- left #git
22:47 Toordog joined #git
22:47 Toordog i'm running git on debian and when i run git branch it doesn't display my branches and if i do git branch -b development && git branch it still doesn't show my new branch.  Also config file doesn't add an entry to specify the new branch.
22:47 psyb0t_ joined #git
22:47 Toordog sorry git checkout -b development
22:48 bl0w3d_0ut joined #git
22:50 bl0w3d_0ut joined #git
22:51 niax joined #git
22:51 d1z joined #git
22:51 d1z hello
22:51 alesan joined #git
22:51 d1z I did git stash a couple of minutes ago in order to remove the work that I had been doing which was leading nowhere
22:51 alesan hello, I would like to have some sort of advice:
22:52 bl0w3d_0ut joined #git
22:52 d1z but there were a couple of useful lines in what was stashed that I'd like to review again. However, when I do git stash show I only get a diff showing me the lines added/removed from which files
22:52 alesan I am working on branch A, I made several changes but I do not want to commit yet. I now want to do some more changes that I know are risky, so I want to be able to go back to where I am quickly
22:52 d1z however I don't get per file diff between the stash the current working directory
22:52 bl0w3d_0ut joined #git
22:52 alesan what is best to do? I do not want to "pollute" branch A with unnecessary, partial commits
22:53 alesan not the new, "risky" changes I want to perform are on top of the current, un-commited code, not on top of A
22:53 d1z or even the diff between what's in the stash and what was in the last commit to which I reset the state to when I did git stash
22:54 d1z alesan: create a new branch
22:54 d1z branches aren't expensive
22:54 s2013 joined #git
22:55 d1z if everything goes good in the end in that branch, then you can merge, or add what you want from that branch manually to master and then throw it away
22:55 alesan sure I can create a new branch. but then?
22:55 alesan are you saying I should create a new branch, commit the current, unfinished code
22:56 alesan and start with the new part?
22:56 alesan if the new part fails, I can checkout the new branch
22:56 nowhereman joined #git
22:56 alesan ???
22:57 alesan in case the changes are OK, and I perform a second commit into branch "B"
22:57 alesan when I merge into A can I have a single commit with all changes coming from B? I do not like the idea to have a temporary commit with non-working code
22:58 kballou left #git
22:59 spacelord_ joined #git
23:00 Cabanossi joined #git
23:01 fmeerkoetter joined #git
23:02 BackEndCoder joined #git
23:02 jacen915 joined #git
23:03 Dougie187 left #git
23:04 Gsham joined #git
23:06 mda1 joined #git
23:09 xissburg joined #git
23:10 rwb joined #git
23:10 Mjaa joined #git
23:12 cdg_ joined #git
23:13 aw1 joined #git
23:17 durham joined #git
23:18 Khisanth joined #git
23:18 cdg joined #git
23:19 brent__ joined #git
23:19 hecliunyx joined #git
23:28 scorphus joined #git
23:28 cdg_ joined #git
23:29 Bob8989 joined #git
23:31 leeN joined #git
23:33 VampiricPadraig_ left #git
23:33 VampiricPadraig joined #git
23:33 cdg joined #git
23:34 PeterReid joined #git
23:35 sathed left #git
23:35 hahuang65 joined #git
23:35 texinwien_ joined #git
23:39 Gsham joined #git
23:39 diogenese joined #git
23:41 Bob8989|2 joined #git
23:41 Starky joined #git
23:43 madewokherd joined #git
23:44 KV joined #git
23:44 Gsham joined #git
23:44 Shakeel_ joined #git
23:48 roelmonnens joined #git
23:51 invisbl joined #git
23:52 Bizkit joined #git
23:54 kyan joined #git
23:55 Olipro joined #git
23:57 Xionkana joined #git

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