Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-28

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

All times shown according to UTC.

Time Nick Message
00:00 cyphase joined #git
00:02 LeBlaaanc joined #git
00:03 GyrosGeier left #git
00:14 tesuji_ joined #git
00:18 GavinMagnus joined #git
00:19 AndroidLoverInSF joined #git
00:19 sarbs joined #git
00:19 GavinMagnus left #git
00:22 Douhan joined #git
00:23 xall joined #git
00:24 hahuang61 joined #git
00:26 kbs joined #git
00:26 jstimm joined #git
00:27 arescorpio joined #git
00:27 Guest_84757 joined #git
00:28 ahmedelgabri joined #git
00:32 sangy joined #git
00:36 torbjorn joined #git
00:37 zumba_ad_ joined #git
00:37 ome joined #git
00:38 rsukla joined #git
00:39 Orion3k joined #git
00:40 mwhooker joined #git
00:44 fstd_ joined #git
00:44 fii joined #git
00:46 filcab joined #git
00:48 tapout joined #git
00:50 Timvde joined #git
00:51 mwhooker joined #git
00:52 akushner joined #git
00:52 xlegoman joined #git
00:53 ahmedelgabri joined #git
00:59 mwhooker joined #git
01:09 z8z joined #git
01:09 Gamecubic joined #git
01:10 Rikairchy joined #git
01:14 dreiss joined #git
01:14 cdg joined #git
01:15 ajf- joined #git
01:17 jimi_ joined #git
01:20 raijin joined #git
01:22 jaguarmagenta joined #git
01:25 hahuang61 joined #git
01:25 liquidjamm joined #git
01:28 nonconvergent joined #git
01:28 shgysk8zer0 joined #git
01:28 ahmedelgabri joined #git
01:28 shgysk8zer0 joined #git
01:30 mmmveggies joined #git
01:32 fahadash joined #git
01:38 thiago joined #git
01:42 ochorocho__ joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and plumbing advice | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Remember to keep your porcelain clean
01:50 rkazak joined #git
01:50 cqi joined #git
01:50 d0nn1e joined #git
01:51 maestrojed joined #git
01:54 justanotheruser joined #git
01:56 HoierM joined #git
01:58 Goplat joined #git
01:59 JanC joined #git
02:04 stantonk joined #git
02:05 stonerfish joined #git
02:12 arthurl joined #git
02:13 harish__ joined #git
02:15 zumba_a__ joined #git
02:16 pwnz0r joined #git
02:23 rkazak joined #git
02:25 hahuang61 joined #git
02:26 woodruffw joined #git
02:26 woodruffw joined #git
02:30 rgrinberg joined #git
02:32 rgrinberg joined #git
02:32 jaguarmagenta joined #git
02:32 Rodya_ joined #git
02:34 hexagoxel joined #git
02:39 MrWoohoo joined #git
02:39 gkatsev joined #git
02:40 tesuji joined #git
02:40 howdoi joined #git
02:44 preyalone joined #git
02:44 Rodya_ joined #git
02:44 chachasmooth joined #git
02:45 CheckDavid joined #git
02:46 ImJune joined #git
02:54 xlegoman joined #git
02:56 eletuchy_ joined #git
02:59 eletuchy joined #git
03:00 DirtyCajun joined #git
03:01 xaviergmail joined #git
03:02 xall joined #git
03:02 kbs joined #git
03:02 Rodya_ joined #git
03:05 nettoweb joined #git
03:06 eletuchy joined #git
03:09 digidog joined #git
03:09 watabou joined #git
03:10 dreiss joined #git
03:15 a_thakur joined #git
03:16 ensyde joined #git
03:19 SwiftMatt joined #git
03:19 ekinmur joined #git
03:21 k3rn31 joined #git
03:22 d4rklit3 joined #git
03:23 dreiss joined #git
03:26 hahuang61 joined #git
03:30 meLon joined #git
03:32 ahmedelgabri joined #git
03:33 jasvinder joined #git
03:36 aavrug joined #git
03:36 MZAWeb joined #git
03:38 aavrug joined #git
03:39 Khisanth joined #git
03:42 zivester joined #git
03:44 ochorocho__ joined #git
03:49 dreiss joined #git
03:50 armenzg joined #git
03:53 tcsc joined #git
03:58 ekinmur joined #git
03:58 nonconvergent joined #git
04:02 mehola joined #git
04:05 aidalgol joined #git
04:05 M-shine joined #git
04:05 EvilPenguin joined #git
04:07 xall joined #git
04:08 eletuchy joined #git
04:13 st0opkid joined #git
04:13 nonconvergent joined #git
04:16 phanimahesh joined #git
04:17 drupald joined #git
04:21 M-mistake joined #git
04:21 M-meznak joined #git
04:21 jaguarmagenta joined #git
04:22 mehola joined #git
04:26 newlifer joined #git
04:27 hahuang61 joined #git
04:27 fscala joined #git
04:28 quetz joined #git
04:29 linuxdaemon joined #git
04:33 hk238 joined #git
04:35 Electrometro joined #git
04:35 k3rn31 joined #git
04:35 cyan__ joined #git
04:40 hahuang61 joined #git
04:41 SwiftMatt joined #git
04:45 ascarter joined #git
04:56 nidr0x joined #git
04:58 chid joined #git
05:01 Cabanossi joined #git
05:03 eletuchy joined #git
05:04 nilg joined #git
05:05 subhojit777 joined #git
05:05 tgunr joined #git
05:06 akushner joined #git
05:10 NeverDie joined #git
05:11 romerocesar joined #git
05:15 stuh84 joined #git
05:16 sangy joined #git
05:16 a_thakur joined #git
05:17 jaguarmagenta joined #git
05:17 sauvin joined #git
05:17 cagedwisdom joined #git
05:17 phanimahesh joined #git
05:18 Andrew_K joined #git
05:21 foox cbreak: jast: fyi, I ended up cloning the project again. Now it works. Pretty strange in my opinion, but now it works. Thanks again and have a nice day
05:22 zumba_ad_ joined #git
05:24 MZAWeb joined #git
05:25 jstimm joined #git
05:28 a_thakur_ joined #git
05:31 a_thakur joined #git
05:32 ahmedelgabri joined #git
05:35 MatthewAllan93 joined #git
05:35 MatthewAllan93 joined #git
05:38 a3Dman joined #git
05:39 ShekharReddy joined #git
05:42 xall joined #git
05:44 ochorocho__ joined #git
05:47 ThomasLocke_ joined #git
05:55 Raging_Hog joined #git
05:58 rscata joined #git
05:59 ascarter joined #git
06:00 TomyLobo joined #git
06:01 liuzhen joined #git
06:01 cdown joined #git
06:02 leehambley joined #git
06:04 cdown_ joined #git
06:04 DirtyCajun joined #git
06:05 sanketdg joined #git
06:07 irco joined #git
06:07 Repox joined #git
06:08 alex1a joined #git
06:09 Rish joined #git
06:10 qt-x joined #git
06:10 david_bz joined #git
06:13 ome joined #git
06:13 xaviergmail joined #git
06:14 Silenced joined #git
06:15 jceb joined #git
06:16 Silenced joined #git
06:21 lindenle joined #git
06:22 wwwald joined #git
06:22 zeemz joined #git
06:22 vuoto joined #git
06:25 nonconvergent joined #git
06:25 carell joined #git
06:25 k3rn31 joined #git
06:26 stantonk joined #git
06:28 leeN joined #git
06:30 zeroed joined #git
06:31 circ-user-gIevh joined #git
06:31 dreiss joined #git
06:32 choki joined #git
06:36 varx joined #git
06:38 Sceorem joined #git
06:40 nonconvergent joined #git
06:41 mithenks joined #git
06:41 SwiftMatt joined #git
06:42 eletuchy joined #git
06:42 a_thakur joined #git
06:42 MrMojito joined #git
06:42 ahmedelgabri joined #git
06:43 tapout joined #git
06:44 jungsubk joined #git
06:45 Alienpruts joined #git
06:46 tomzx joined #git
06:50 Repox Hi guys. I have a commit id that I'm wondering why it's in my develop branch, when I have a feature branch that I haven't merged in yet. I probably made a mistake, but can I verify how this commit id got into my develop branch?
06:50 dhruva joined #git
06:51 _ikke_ Repox: tools like gitk, or git log --graph --oneline --decorate --all
06:51 _ikke_ This will give you a visual representation of the history
06:51 ctcrnitv joined #git
06:55 eijk joined #git
06:56 Duikb00t left #git
06:57 ariath joined #git
06:57 Rish joined #git
06:58 Brain joined #git
06:58 PCatinean joined #git
06:58 watabou joined #git
07:00 M-meznak joined #git
07:00 settermjd joined #git
07:02 demiro joined #git
07:02 Andrew_K joined #git
07:02 nnyk_ joined #git
07:02 encod3 joined #git
07:12 basiclaser joined #git
07:12 emPi joined #git
07:14 User458764 joined #git
07:18 JeroenT joined #git
07:20 SwiftMatt joined #git
07:21 lordjancso joined #git
07:22 lindenle joined #git
07:24 katherine joined #git
07:24 zumba_addict joined #git
07:25 dsteplight__ joined #git
07:25 Silenced joined #git
07:25 Silenced joined #git
07:26 jknetl joined #git
07:28 Kicer86 joined #git
07:28 Balliad joined #git
07:29 fees joined #git
07:29 ahmedelgabri joined #git
07:29 mehola joined #git
07:31 alcohol joined #git
07:32 imjacobclark joined #git
07:33 Saturn812 joined #git
07:33 Sucks joined #git
07:33 ahmed_elgabri joined #git
07:35 mariuscc joined #git
07:35 DieguezZ joined #git
07:38 rkazak joined #git
07:40 eletuchy joined #git
07:43 eletuchy_ joined #git
07:45 ochorocho__ joined #git
07:46 eletuchy joined #git
07:47 phanimahesh joined #git
07:47 multi_io joined #git
07:48 eletuch__ joined #git
07:50 imjacobclark joined #git
07:51 Saturn812 joined #git
07:51 eletuchy joined #git
07:52 xaviergmail joined #git
07:53 ki0 joined #git
07:54 eletuchy_ joined #git
07:54 voiter2 joined #git
07:55 DANtheBEASTman i recently learned that i 1) somehow had my github password stored in plaintext in ~/.gitconfig and 2) that i had stored my gitconfig on github. i've sinced changed all my passwords, but rather than delete the repo and start the history over, i'd like to remove this from the commit that added it.. any tips on how to go about this?
07:55 garethdaine joined #git
07:56 Stummi history rewrite and force push, but since you changed all your passwords anyway, do you really need this?
07:57 izabera maybe his password was HitlerWasRight1945
07:57 eletuchy joined #git
07:58 osse !sensitive > DANtheBEASTman
07:58 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
07:59 DANtheBEASTman danke!
07:59 osse more like 1939, amirite
07:59 Guest91508 joined #git
07:59 watabou joined #git
08:00 grassass joined #git
08:00 eletuchy_ joined #git
08:03 liuzhen_ joined #git
08:04 a_thakur joined #git
08:04 eletuchy joined #git
08:05 Juzzika joined #git
08:05 _pix joined #git
08:06 DANtheBEASTman hmm bfg seems nice, now to figure out how to build this scala business
08:07 eletuchy_ joined #git
08:08 cbreak DANtheBEASTman: alternatives: git filter-branch, git rebase -i
08:09 DANtheBEASTman eh, i've been working with clojure code lately, might as well try scala while i'm at it
08:09 clmsy joined #git
08:10 eletuchy joined #git
08:12 DANtheBEASTman it's a shame they don't release a .jar for bfg though
08:13 eletuchy_ joined #git
08:14 isxek joined #git
08:15 Saturn812 joined #git
08:15 Douhan joined #git
08:17 piattino joined #git
08:17 osse say what now
08:18 osse DANtheBEASTman: http://i.imgur.com/puMAipY.png
08:19 jaguarmagenta joined #git
08:19 eletuchy joined #git
08:22 eletuchy_ joined #git
08:22 marcogmonteiro joined #git
08:23 DANtheBEASTman ..does that...? really? i'd just assumed that would be a tarball of the git repo..
08:24 eletuch__ joined #git
08:25 DANtheBEASTman doh
08:26 DANtheBEASTman thanks for pointing that out osse, probably saved me an hour of my life...
08:27 King_Hual joined #git
08:27 King_Hual joined #git
08:27 osse "shame" is a big word when it rests on unfounded assumptions :p
08:30 Saturn812 joined #git
08:30 t0by joined #git
08:31 mehola joined #git
08:31 stantonk joined #git
08:31 eletuchy joined #git
08:32 Codfection joined #git
08:33 DANtheBEASTman you're quite right, my apologies. and thanks again
08:33 phanimahesh joined #git
08:34 circ-user-gIevh joined #git
08:34 eletuchy_ joined #git
08:35 fold4 joined #git
08:36 harish_ joined #git
08:37 eletuchy joined #git
08:39 eletuch__ joined #git
08:40 Oebele joined #git
08:41 Oebele joined #git
08:42 dminca joined #git
08:42 eletuchy joined #git
08:43 nnyk_ joined #git
08:44 circ-user-gIevh joined #git
08:48 eletuchy_ joined #git
08:49 demiro joined #git
08:49 sondr3 joined #git
08:50 eletuch__ joined #git
08:51 rolha joined #git
08:51 kurkale6ka joined #git
08:51 FrontPsych joined #git
08:52 fold4 joined #git
08:52 nonconvergent joined #git
08:53 jmd joined #git
08:53 fahadash joined #git
08:54 eletuchy joined #git
08:55 ZenithDK joined #git
08:56 jmd hi
08:56 eletuchy_ joined #git
08:56 ntonjeta joined #git
08:57 King_Hual joined #git
08:58 xaa joined #git
08:58 ZenithDK joined #git
08:59 eletuchy joined #git
09:01 King_Hual` joined #git
09:01 a_thakur joined #git
09:02 jaguarmagenta joined #git
09:03 mischat joined #git
09:04 watabou joined #git
09:06 eletuchy_ joined #git
09:06 nilg` joined #git
09:07 achadwick joined #git
09:07 fracting joined #git
09:08 ZenithDK joined #git
09:08 Doginal joined #git
09:09 tonyj joined #git
09:10 eletuchy joined #git
09:11 nick123 joined #git
09:11 imjacobclark joined #git
09:12 johnsno joined #git
09:15 acetakwas joined #git
09:15 eletuchy_ joined #git
09:16 cdown joined #git
09:17 zeemz joined #git
09:17 alcroito joined #git
09:18 alcroito Hi, does anyone know if there is any on-going work on making git worktree work with submodules?
09:18 King_Hual joined #git
09:19 eletuchy joined #git
09:20 a_thakur_ joined #git
09:20 a_thaku__ joined #git
09:23 fuchstronaut joined #git
09:23 fuchstronaut joined #git
09:24 fornax joined #git
09:25 rbr joined #git
09:25 lindenle joined #git
09:26 TomyWork joined #git
09:26 King_Hual joined #git
09:26 King_Hual joined #git
09:26 JeroenT joined #git
09:28 ramsub07 joined #git
09:29 SirOliver joined #git
09:32 romerocesar joined #git
09:35 jbitdrop joined #git
09:36 t0by joined #git
09:37 mflow joined #git
09:46 ochorocho__ joined #git
09:47 fornax joined #git
09:48 wrouesnel1 joined #git
09:53 dsdeiz joined #git
09:55 clmsy joined #git
09:55 digidog joined #git
09:57 DieguezZ joined #git
09:59 mischat joined #git
10:01 fornax joined #git
10:01 obiwahn hey is there a way to specify for a branch differen remotes for pushing and fetching?
10:01 obiwahn or is there just one upstream?
10:05 BlessJah git push <remote> <src>:<dest>
10:05 watabou joined #git
10:05 tobiasvl I think he meant different remotes for a branch, not different branches for local and remote
10:06 BlessJah oh, right
10:07 King_Hual joined #git
10:07 BlessJah then git config branch.<name>.remote and .pushRemote seems the way to go
10:07 nettoweb joined #git
10:08 binaryplease1 joined #git
10:09 alcroito left #git
10:10 Sceorem joined #git
10:10 keltvek joined #git
10:11 King_Hual` joined #git
10:12 astrofog joined #git
10:14 User458764 joined #git
10:14 CameronShorter joined #git
10:16 rominronin joined #git
10:16 Sceorem_ joined #git
10:16 digidog joined #git
10:17 Sceorem__ joined #git
10:25 fornax joined #git
10:26 imjacobclark joined #git
10:26 bobdobbs joined #git
10:28 bobdobbs I made a mess of my the code I'm working on. So I want to roll back to my last commit. If I do 'git checkout [first few digits of last commit signature]' I am shown this message: https://pastee.org/u78u4
10:29 bobdobbs I'm not sure what this means exactly. What are the implications?
10:30 bobdobbs generally, I only see "you are in detached head mode" when I've messed up really bad, and I'm about to lose work.
10:30 tjone270_ joined #git
10:30 _ikke_ yeah, you don't want to just check a random commit
10:30 _ikke_ I mean, a commit by it's hash code
10:31 bobdobbs hmmm
10:31 _ikke_ git checkout - to go back to the previous branch
10:31 bobdobbs ah, ok
10:31 Silenced joined #git
10:31 Silenced joined #git
10:31 CameronShorter left #git
10:32 guardianJ joined #git
10:32 ilmari 'git reset --hard' discards the changes in your working directory
10:33 stantonk joined #git
10:33 phanimahesh joined #git
10:34 ilmari if you want to reset your branch (and working directory) back to an earlier commit, 'git reset --hard <commit>'
10:34 kfunk joined #git
10:35 sdothum joined #git
10:37 guardianJ joined #git
10:39 SirOliver joined #git
10:41 JeroenT joined #git
10:44 fscala joined #git
10:51 johnmilton joined #git
10:52 raven-au joined #git
10:52 nettoweb joined #git
10:53 Rico joined #git
10:53 Rico hello
10:53 ams__ joined #git
10:53 Rico I'm looking for a way to apply a patch (https://github.com/PowerDNS/pdns/commit/e​230f8afd4fa3e7cbc6143abc743ca0e4537a20c) via git command line. is there a way ?
10:53 SirOliver joined #git
10:54 vamshi joined #git
10:54 guardianJ joined #git
10:55 kedare joined #git
10:56 _ikke_ git apply < patchfile
10:58 qasaur joined #git
11:01 SirOliver joined #git
11:01 RedShift joined #git
11:02 circ-user-gIevh joined #git
11:04 Rico _ikke_:  no way to use the commit hash directly, without having to download the patch file ?
11:05 dimi1947 joined #git
11:05 tobiasvl well, git cherry-pick hash
11:05 tobiasvl will apply the commit
11:07 mischat joined #git
11:08 yqt joined #git
11:09 watabou joined #git
11:12 ozette joined #git
11:12 nick123 joined #git
11:12 fuchstronaut joined #git
11:13 eatsfoobars joined #git
11:13 Andrew_K joined #git
11:13 demiro joined #git
11:14 ojdo joined #git
11:18 fuchstronaut joined #git
11:18 rnsanchez joined #git
11:20 djb-irc joined #git
11:21 jimi_ joined #git
11:23 davisonio joined #git
11:25 mdw joined #git
11:25 imjacobclark joined #git
11:28 eletuchy_ joined #git
11:29 eatsfoobars joined #git
11:31 eletuch__ joined #git
11:31 liquidjamm joined #git
11:33 romerocesar joined #git
11:34 eletuchy joined #git
11:36 eletuchy_ joined #git
11:38 mdw joined #git
11:40 fornax joined #git
11:40 stonerfish joined #git
11:41 eletuchy joined #git
11:43 eletuch__ joined #git
11:44 ramsub07 joined #git
11:45 User458764 joined #git
11:47 ochorocho__ joined #git
11:47 CameronShorter joined #git
11:49 eletuchy joined #git
11:52 raijin joined #git
11:53 eletuchy_ joined #git
11:54 eletuch__ joined #git
11:59 synthroid joined #git
11:59 samara joined #git
12:01 eletuchy joined #git
12:01 nwf_ joined #git
12:02 tomog999_ joined #git
12:04 eletuchy_ joined #git
12:05 Sceorem__ joined #git
12:06 algae joined #git
12:07 zaherdirkey_ joined #git
12:08 zaherdirkey_ hi i want to rebase one file back to old commit, is that possible?
12:08 tvw joined #git
12:08 basiclaser joined #git
12:08 CameronShorter left #git
12:09 phanimahesh zaherdirkey_: what do you mean by rebase a file back to old commit?
12:09 WayToDoor joined #git
12:10 watabou joined #git
12:10 phanimahesh do you want to revert a file to what is in an older commit?
12:10 phanimahesh or do you want to pick changes from an older commit and apply them to a file?
12:10 phanimahesh or something else entirely?
12:10 zaherdirkey_ i want to remove the corrupted changes from my history for that file
12:11 zaherdirkey_ i want to revert/rebase back my history to last good commit
12:11 zaherdirkey_ for that file only
12:12 ilmari do you want the history to look like those changes never happened, or just restore the state of the file to what it was like before those changes?
12:12 FunkyAss joined #git
12:14 eletuchy joined #git
12:16 zaherdirkey_ yes, i want my history to look like never happened
12:16 zaherdirkey_ but for one file
12:17 phanimahesh zaherdirkey_: That would involve !rewriting history
12:17 gitinfo zaherdirkey_: [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
12:17 phanimahesh You'll have to use filter-branch to clean up the history, and then push --force-with-lease to update the remote
12:19 Silenced joined #git
12:19 Silenced joined #git
12:20 zaherdirkey_ i will try, ty
12:22 rwb joined #git
12:24 netj joined #git
12:25 playfullyExist joined #git
12:27 ShekharReddy joined #git
12:28 lindenle joined #git
12:29 aguimaraes1986 joined #git
12:29 absence i've rebased a branch on master, and i would like to move the first few commits of that branch to master, but leave the rest of the branch as it is. how do i proceed?
12:32 lss8 joined #git
12:32 CheckDavid joined #git
12:33 espindola joined #git
12:33 mischat_ joined #git
12:33 fmcgeough joined #git
12:34 kmtonquest joined #git
12:34 kmtonquest hi guys..
12:34 gitinfo kmtonquest: 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.
12:34 kmtonquest just one quick query
12:34 kmtonquest i have a git branch whose remote is corrupted..
12:35 kmtonquest its a tracking branch - when i am trying to delete it is not allowing..
12:35 kmtonquest giving me fatal: object b666934e4799503647281d613a07e0668113d6e8 is corrupted
12:35 kmtonquest any way i can delete this branch from remote tracking?
12:35 stantonk joined #git
12:37 kmtonquest anyone? how to delete a corrupted branch ?
12:37 imjacobclark joined #git
12:37 HoierM joined #git
12:37 grawity git update-ref -d refs/remotes/origin/whatever
12:37 CJKinni joined #git
12:38 kmtonquest grawity, how can i do it directly in bare repo?
12:38 grawity git update-ref -d refs/remotes/origin/whatever
12:38 grawity though bare repos generally don't have remote-tracking branches...
12:39 ramsub07 joined #git
12:39 lione_1 left #git
12:40 keyus joined #git
12:40 davisonio joined #git
12:40 keyus left #git
12:40 MZAWeb joined #git
12:40 [Brain] joined #git
12:44 rgrinberg joined #git
12:45 kmtonquest in my bare repo i see branches in it..
12:45 kmtonquest how would i delete that??
12:45 dan2k3k4 joined #git
12:45 kmtonquest if one is corrupted?
12:45 jceb joined #git
12:49 cdown joined #git
12:49 alex1a_ joined #git
12:50 WayToDoor joined #git
12:54 jeffreylevesque joined #git
12:55 nnyk_ joined #git
12:56 fuchstronaut joined #git
12:56 howdoi joined #git
12:57 liquidjamm joined #git
12:57 toogley joined #git
12:59 kulelu88 joined #git
12:59 kulelu88 joined #git
13:01 liquidjamm joined #git
13:01 fuchstronaut joined #git
13:02 ochorocho__ joined #git
13:03 demiro joined #git
13:03 Shentino joined #git
13:05 a_thakur joined #git
13:06 dimi1947 joined #git
13:10 watabou joined #git
13:13 snowkidind joined #git
13:13 PSan joined #git
13:14 shgysk8zer0 joined #git
13:20 zivester joined #git
13:20 efdetonator joined #git
13:22 Junior joined #git
13:22 kbs joined #git
13:23 cbreak kmtonquest: man git-branch
13:23 gitinfo kmtonquest: the git-branch manpage is available at http://jk.gs/git-branch.html
13:23 cbreak look for -d
13:23 GavinMagnus joined #git
13:24 eatsfoobars joined #git
13:25 rnsanchez_ joined #git
13:26 kitsu joined #git
13:26 GavinMagnus left #git
13:27 ullu joined #git
13:28 jokester joined #git
13:28 SirFunk_ I have a blob sha for a file that should have been filtered out of my repo. When I do something like this: http://stackoverflow.com/a/223890/907035 to see what commits have that blob in their tree. When I get one of those commits and do `git branch -a --contains` it shows nothing containing that commit. How can I find out what is still referencing that blob?
13:28 barteks2x joined #git
13:29 tuor Hi I want to commit an older state of a file. I have done changes and pushed them. Now I want to go back and push them.
13:29 grawity git checkout <oldcommitID> -- myfile.txt
13:29 Rynomster joined #git
13:29 grawity git add myfile.txt
13:29 linx joined #git
13:29 grawity git commit -m "Reverting myfile to version XYZ"
13:30 tuor grawity, ah ok thx!
13:30 grawity or, if you want to *undo* a specific commit (rather than just go back to it), there's `git revert`
13:30 Darcidride joined #git
13:31 i7c Emphasis on undoing a *commit*, not just getting an older version of one *file*.
13:31 synthroi_ joined #git
13:31 dhanush joined #git
13:31 i7c Because checkout <someversion> -- <somefile> also doesn't "go back" to that version really.
13:31 eletuchy joined #git
13:31 i7c as in HEAD in unchanged.
13:32 grawity hence the following 'git commit'
13:32 Shentino joined #git
13:32 i7c Yeah, I know you know, I just wanted to clearify for tuor. :)
13:33 diegoviola joined #git
13:34 tuor And if I want to delete a commit I did not push to the server? How can I do that?
13:35 i7c The last one or some commit in the middle of your history?
13:35 grawity !remove_commit
13:35 gitinfo You can use rebase to remove commits: git rebase --onto <commit>~1 <commit> <branch>. Note this will !rewrite history.
13:35 grawity !postproduction
13:35 gitinfo So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
13:35 ash_workz joined #git
13:36 tuor i7c, the last commit. Like "delete all what I changed since the last git pull"
13:36 fracting joined #git
13:36 grawity that's not entirely the same thing
13:37 grawity you might want to reset to origin/master or something, in this case
13:37 grawity or to HEAD^
13:37 encod3 joined #git
13:37 tuor ah, git reset origin/master sounds what I want.
13:37 fox_mulder_cp joined #git
13:38 i7c --hard, probably
13:38 nnyk_ joined #git
13:38 shinnya joined #git
13:39 tuor i7c, yes. → git reset --hard origin/master
13:39 shgysk8zer0 joined #git
13:39 fox_mulder_cp hi, i want create new branch, test some here in it, and merge it as one complete commit, without reverts, resets, and ets ctuff for make reflog clean. how to i can do it?
13:39 TooLmaN joined #git
13:40 toogley joined #git
13:40 grawity pretty sure you mean the 'log', not the 'reflog'
13:40 i7c merge --ff-only will ensure linear history when merging.
13:40 grawity anyway, there's --squash
13:41 xaviergmail joined #git
13:41 kbs SirFunk_: [not a git expert, but for lack of better minds chipping in :)] is it too weird to just have a script that cat-file's each blob and greps for your sha of interest?
13:41 fox_mulder_cp grawity: in reflogs i can see reverts, resets, etc, which is hidden from log
13:41 mmlb joined #git
13:41 grawity yes, and who cares about those?
13:42 grawity the reflog is only visible on your own personal repo
13:42 SirFunk_ kbs: hmm... maybe that would be more accurate
13:42 kbs SirFunk_: alternately, maybe just move that blob out, and see what git fsck reports? (haven't tested this)
13:42 grawity and the reflog isn't copied during merges, anyway
13:42 fox_mulder_cp grawity: so, it not visible under github's/bitbicket remotes?
13:42 grawity so if a revert happened on branch X, it will show up in X's reflog and HEAD's reflog but not Y's reflog
13:42 grawity fox_mulder_cp: yes, it is never pushed or fetched in any way
13:43 fox_mulder_cp grawity: and when i merge it into another branch too>
13:43 parasite joined #git
13:43 fox_mulder_cp ?
13:43 fox_mulder_cp and why this reflog is needed?
13:44 grawity convenience and safety
13:44 shgysk8zer0 joined #git
13:44 i7c To help you figure out why and how you messed up things. ;)
13:44 grawity e.g. to quickly undo mistaken history rewrites
13:45 kbs SirFunk_: at least for me, the mv out the object and git fsck reports the parent reference. I guess it's at least less painful than cat-fileat least :)
13:45 f3r70rr35f joined #git
13:46 grawity or, doing a 'git pull' and being able to check what got pulled
13:46 grawity (@{1}..)
13:49 dstarh joined #git
13:52 ExoUNX joined #git
13:52 fox_mulder_cp so, when i drop branch, reflog cleans too?
13:53 ShekharReddy joined #git
13:53 fracting joined #git
13:56 afuentes joined #git
13:57 GodGinrai joined #git
13:59 SubjectNull joined #git
13:59 phaleth joined #git
14:00 AaronMT joined #git
14:00 kadoban joined #git
14:02 SirFunk_ kbs: How do I find the blob to move it out?
14:03 D-Boy joined #git
14:04 i7c fox_mulder_cp, if you delete a branch, the reflog for that branch disappears.
14:04 i7c fox_mulder_cp, the commits the reflog pointed to might still be around tho (or likely are).
14:04 GandalfTheWizard joined #git
14:05 kbs SirFunk_: if your full sha id is ab012345... - the file should be under .git/objects/ab/012345...
14:06 SirFunk_ kbs: do I have to 'unpack' or something first?
14:06 kbs SirFunk_: ah, yes - if you recently gc'ed or packed it, indeed...
14:07 DirtyCajun left #git
14:08 fox_mulder_cp i7c: rthanks
14:08 johntramp joined #git
14:08 fox_mulder_cp left #git
14:09 synthroid joined #git
14:09 shgysk8zer0 joined #git
14:09 eatsfoobars joined #git
14:10 hk238 joined #git
14:11 NeverDie joined #git
14:12 mmlb joined #git
14:14 mmlb joined #git
14:15 watabou joined #git
14:16 SubjectNull left #git
14:17 PSan joined #git
14:17 kbs SirFunk_: hm, not having fully thought out the packfile issue :) you'll probably have realized this, but would mean moving out the pack and index file out of the repo, then git unpack-object < pack-nnn.pack
14:18 gechr joined #git
14:18 shgysk8zer0 joined #git
14:21 bango2 joined #git
14:22 nonconvergent joined #git
14:24 bango2 joined #git
14:25 phanimahesh joined #git
14:29 arthurl joined #git
14:29 ekinmur joined #git
14:30 Tim-SEM joined #git
14:30 whatevsz joined #git
14:30 SonicJam joined #git
14:32 Tim-SEM The time is right to make new friends.
14:33 madewokherd joined #git
14:33 efdetonator joined #git
14:33 jokester joined #git
14:34 jast is that you, fortune-mod?
14:35 dhanush joined #git
14:35 phanimah1sh joined #git
14:36 lindenle joined #git
14:37 chigang_ joined #git
14:39 Silenced joined #git
14:39 Silenced joined #git
14:40 asdofindia joined #git
14:40 thiago joined #git
14:40 akushner joined #git
14:40 IWishIKnew joined #git
14:44 wrouesnel3 joined #git
14:44 samson joined #git
14:46 rsukla joined #git
14:46 bencoman joined #git
14:46 stantonk joined #git
14:48 kbs joined #git
14:48 playfullyExist joined #git
14:48 a_thakur joined #git
14:49 troulouliou_div2 joined #git
14:50 harish_ joined #git
14:50 Ahmed90 joined #git
14:51 bencoman I have a question about   rebase.missingCommitsCheck.    I'm trying to encourage use of rebase to clean up before submitting a pull request, and respond to this rebase disaster story "Mostly my discouraging of rebase -i comes from experience with people who made a mistake (e.g. as simple as deleting a line and then getting "lucky" and having git no
14:51 bencoman t complain about conflicts during the rebase) to lose a commit entirely."
14:51 qsx jast: http://pics.nase-bohren.de/is-that-you.jpg
14:51 bencoman http://forum.world.st/Should-I-push-or-​request-a-pull-td4901725.html#a4903269
14:52 clemf joined #git
14:53 bencoman I tried this...
14:53 bencoman $ git config --global rebase.missingCommitsCheck warn
14:53 bencoman $ git config --global rebase.missingCommitsCheck warn
14:53 bencoman $ git checkout -b testMissingCommitsCheckWarn master
14:53 bencoman $ for N in 1 2 3 4 ;  do (echo $N >> blah ;  git commit -am $N) ;  done
14:54 bencoman $ git rebase -i master
14:54 bencoman # in editor, delete commit 2 line, save, exit
14:54 ResidentBiscuit Didn't your momma ever teach you to not paste a bunch of lines of text into IRC?
14:54 Balliad joined #git
14:54 Rodya_ joined #git
14:55 Balliad joined #git
14:55 LionsMane joined #git
14:55 Tim-SEM left #git
14:56 samson git commit -a is not adding untracked files for me. Am I missing something?
14:56 bencoman I knew not to flood past.  I thought it was okay to paste a small number one at a time.  my apologies.
14:56 davisonio joined #git
14:56 canton7 samson, no. it doesn't. it's the equivalent of 'add -u', i.e. stage modifications and deletions
14:56 canton7 samson, frin man git-commit: "-a: Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected. "
14:56 gitinfo samson: the git-commit manpage is available at http://jk.gs/git-commit.html
14:56 canton7 *from
14:57 ResidentBiscuit `git add -A` if you want all of the files
14:57 samson git add -A will still honor the .gitignore?
14:57 ResidentBiscuit Yes
14:57 canton7 yep
14:57 ResidentBiscuit Ignored files won't even show up as untracked files
14:57 samson thank you gentlemen!
14:57 samson ah yes, you're correct
14:58 stantonk joined #git
14:58 samson I should have read the reference more carefully.
14:58 GodGinrai man git-log
14:58 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
14:58 GodGinrai hehe
14:59 dopesong joined #git
15:00 arooni joined #git
15:01 canton7 bencoman, do carry on: you were just getting to the good bit
15:02 bencoman try again.... https://gist.github.com/bencoman/​a145fc9a2b084ef9125b1804b5d47411
15:02 bencoman added a bit more detail
15:02 ochorocho__ joined #git
15:03 canton7 'git --version'?
15:04 bencoman Is there something I am not understanding about using this?
15:04 canton7 what's your git version?
15:04 bencoman git version 2.1.4
15:04 canton7 right, that feature was introduced in 2.6.0
15:04 canton7 time to upgrade :)
15:05 sangy joined #git
15:05 ShekharReddy joined #git
15:05 bencoman cool!! thats what I needed to know.  (sorry I should have tried that first)
15:05 canton7 (for future, I found that by going to the github link you gave, blicking 'Blame', find the relevant lines, click the commit, look at the list of tags that that commit is in, just below the commit message)
15:07 leeN joined #git
15:07 niels_ joined #git
15:08 kpease joined #git
15:08 bencoman found it, thanks for the lesson canton.
15:09 skalpin What's a good diff tool for osx. I'm working in xamarin and I have to resolve some merge conflicts.
15:09 GodGinrai skalpin: vimdiff
15:09 qsx p4diff/p4merge
15:09 Balliad joined #git
15:09 tyreld joined #git
15:10 MZAWeb joined #git
15:10 skalpin awesome! thanks GodGinrai and qsx
15:10 GodGinrai np
15:10 bencoman btw, it would be nice if   git config    complained  about trying to set variables it doesn't know.   I probably would have ended up on an easier troubleshooting path.
15:11 kadoban Heh, it doesn't? That's rather horrible
15:11 zivester joined #git
15:11 qsx i wouldn’t say so
15:11 qsx some 3rdparty tools related to git put their config in gitocnfig
15:11 kadoban Sure, but a warning would be nice if it's just a typo.
15:11 bencoman errr. maybe I'm wonrg
15:12 bencoman maybe the third party tools need to register their variables before setting them
15:12 dmto joined #git
15:13 bencoman if I do git config xxxxxxx warn
15:13 bencoman if I do $ git config xxxxxxx warn
15:13 Electrometro joined #git
15:13 a_thakur joined #git
15:13 bencoman I get...    error: key does not contain a section: xxxxxxx
15:13 qsx yeah let’s break backwards compatibility
15:14 nick123 joined #git
15:14 bencoman but   git config rebase.xxxxx warn     doesn't claim
15:14 Rodya_ joined #git
15:14 bencoman @qsx, good point
15:15 kulelu88 joined #git
15:15 skapunker joined #git
15:16 fuchstronaut joined #git
15:16 jumpman So, I just got an issue that reads "Please remove unneeded heads."
15:17 jumpman great! I can do this! i've used rebasing for this for ages
15:17 jumpman but the `develop` branch is protected
15:17 jumpman can I clean up heads without unrestricted access to forcing & rebasing?
15:17 rkazak joined #git
15:17 _ikke_ What does it mean to clean up heads?
15:17 bencoman Does a third party tool define its own namespace before the dot  e.g. replacing rebase   in  rebase.xxxx ?   Or do they add items after the dot?
15:18 demiro joined #git
15:19 _ikke_ git config is a general tool to edit config files, it does not now all valid items
15:19 _ikke_ know
15:19 watabou joined #git
15:19 bencoman okay.  I'll leave it there.  thanks guys.
15:19 eletuchy joined #git
15:20 canton7 (some third-party tools also use their own special keys in git-config to store their own data, which would be broken if git-config did validation)
15:21 liranp joined #git
15:21 canton7 also, keys must have a least one dot in them, which is why your "key does not contain a section" error came up
15:21 canton7 ah, he left ><
15:22 robotroll joined #git
15:23 tristanp joined #git
15:23 liranp joined #git
15:27 Rodya_ joined #git
15:28 solars joined #git
15:29 solars if I have two branches master, dev - I usually rebase so can just do 'merge dev' from master without any merge commits. How can I see before if a merge commit is necessary or if it works straight forward?
15:31 perlpilot perhaps try 'git merge --ff-only'
15:31 perlpilot ?
15:31 kadoban solars: Use the --ff-only switch to merge, if it fails, a merge commit is necessary.
15:31 djb-irc joined #git
15:31 dopesong joined #git
15:31 perlpilot solars: unless you're looking to just check without affecting the state of the repo.
15:32 perlpilot (in which case, I have no idea :)
15:32 weox joined #git
15:32 solars ah
15:33 solars if I use --ff-only, how can I then automatically continue if it fails, or what would be the next action?
15:33 solars if it changes the state
15:33 solars ah, sorry I assume --ff-only means only commit if straight forward is possible
15:34 Rodya_ joined #git
15:34 kbs maybe git log --graph --pretty=oneline master...branch -- visually look for any branches?
15:35 phanimahesh joined #git
15:35 sybariten left #git
15:38 tvon joined #git
15:41 Rodya_ joined #git
15:41 Shentino joined #git
15:43 tvw joined #git
15:43 Psychiatrist joined #git
15:46 Rodya_ joined #git
15:46 dopesong joined #git
15:47 irco joined #git
15:47 sagerdearia joined #git
15:52 eatsfoobars joined #git
15:53 SirFunk_ kbs: I finally removed that blob and ran fsck. I got the hash of the tree that refernced it.. now what?
15:53 djb-irc joined #git
15:54 kbs SirFunk_: repeat same with the tree hash, and so on - it's just a crude hack to get the "back" pointers, until you hit a commit of interest
15:55 SirFunk_ ahh, ok... I don't really know what a tree hash is
15:55 mmmveggies joined #git
15:55 clemf joined #git
15:56 kbs oh! sorry then :) it's probably a bit too gross a hack to consider. But trees are basically a list of blobs (you can git cat-file -p <sha> to see what it contains) and is how git represents a directory snapshot
15:56 hashpuppy joined #git
15:57 lindenle joined #git
15:57 SirFunk_ ahh ok. I figured it was something like that
15:57 kbs commits are just blobs that contain references to parent commit blobs, and a tree blob. git cat-file -p <thing> will generally show details around any blob.
15:57 LBV_User joined #git
15:58 watabou joined #git
16:00 UTAN_dev joined #git
16:00 HoierM joined #git
16:01 madewokherd joined #git
16:02 flavius joined #git
16:02 yqt joined #git
16:03 ramsub07 hello, how do i check if i have changes committed, but not pushed ?
16:03 HedgeWork ramsub07: "git status"
16:03 TomyLobo joined #git
16:03 synthroid joined #git
16:03 ramsub07 HedgeWork: that says if i have not committed, not pushed
16:03 durham joined #git
16:04 thiago joined #git
16:04 HedgeWork hang on, let me turn legit off, it might modify my status output :)
16:04 netcarver joined #git
16:04 synthroi_ joined #git
16:04 durham joined #git
16:04 cdown joined #git
16:05 HedgeWork nope, in vanilla it tells me things like: https://ghostbin.com/paste/5ofmf
16:06 _ikke_ HedgeWork: "Your branch is ahead of 'origin/master' by 1 commit."
16:06 HedgeWork _ikke_: that was my point.
16:06 HedgeWork :)
16:06 _ikke_ Ah, got confused :P
16:06 HedgeWork np
16:07 Rodya_ joined #git
16:10 fission6 joined #git
16:11 fission6 i merge a bunch of code to master and push it to github, i dont want this code in master anymore, anyway to undo all the commits a part of another merge
16:12 Rodya_ joined #git
16:12 durham joined #git
16:14 fission6 any ideas?
16:15 fission6 basic want to unmerge the whole thing / branch out of master and get master to what it was before i merged
16:15 CJKinni joined #git
16:15 Gearoto joined #git
16:17 BlaXpirit fission6, undo merge commit?
16:17 BlaXpirit i mean  try   git revert <mergecommit>   and see what happens
16:17 fuchstronaut joined #git
16:18 Rodya_ joined #git
16:18 _ikke_ you'd have to provide -m1 with that
16:18 dopesong joined #git
16:18 qasaur joined #git
16:18 fission6 BlaXpirit: what do i want?
16:19 circ-user-G1JuV joined #git
16:21 fission6 _ikke_: sorry, what do i want?
16:21 Rodya_ joined #git
16:22 tarkus joined #git
16:22 b1tchcakes joined #git
16:22 tarkus Do you think it's a good practice to have iOS, Android, Web, Server portions of your app within the same repo as it is here? https://github.com/este/este
16:24 eijk_ joined #git
16:24 Oog joined #git
16:24 qsx tarkus: no.
16:24 Rodya_ joined #git
16:24 grawity with one developer, not really
16:25 grawity with more than one developer, definitely not
16:25 tvon joined #git
16:26 tarkus qsx, grawity.. does this project structure of a single-page app makes sence? where front-end code is located in "client" folder, and all the server-side code in "server" folder? https://github.com/kriasoft/aspnet-starter-kit
16:26 synthroid joined #git
16:26 zeroed joined #git
16:26 fission6 _ikke_: do i want -m 1 or --force?
16:26 fission6 https://coderwall.com/p/o0krbw/undo-a-git​-merge-that-has-been-pushed-to-the-server
16:27 aard_ joined #git
16:27 diegoviola how do I find the parent of a commit?
16:27 diegoviola the commit in this case is a merge
16:28 nonconvergent joined #git
16:29 grawity then it has multiple parents
16:29 grawity commit^ (aka commit^1), commit^2, sometimes commit^3 and so on
16:30 grawity usually commit^ is the "main" branch, while commit^2 is the "merged-in" branch
16:31 _ikke_ I've never seen it otherwise
16:31 diegoviola thanks
16:31 xaviergmail joined #git
16:32 ochorocho__ joined #git
16:32 diegoviola https://git.kernel.org/cgit/linux/kerne​l/git/torvalds/linux.git/commit/?id=266​c73b77706f2d05b4a3e70a5bb702ed35431d6
16:32 fission6 _ikke_: i just did git revert -m 1 commit, it looks like it worked but now i am reading that future merges may not work?
16:32 diegoviola that's the merge in this case
16:33 GodGinrai whoa, seeing both grawity and diegoviola talking in here, I had to double-check to make sure this wasn't #archlinux XD
16:33 Rodya_ joined #git
16:33 diegoviola oh there's the parent
16:33 _ikke_ fission6: You only undid the changes that the merge brought in, not the merge itself
16:33 diegoviola GodGinrai: heh
16:33 _ikke_ fission6: so for git it still looks as if the branch has merged
16:34 fission6 ok, what does that mean if i go to the other branch make some more changes, and try to merge back in to master? will it grab everything in that branch or are original things going to be missing
16:34 fission6 _ikke_:
16:34 fission6 i just need to do a days worth of clean up and then i'd like to merge the branch into master, but i fear now its going to only pick up the work i did since the revert? _ikke_
16:35 Rodya_ joined #git
16:36 phanimah1sh joined #git
16:36 _ikke_ correct
16:36 _ikke_ But you can always revert the revert again
16:36 fission6 hahaha are you kidding me
16:36 mehola joined #git
16:36 fission6 wtf am i suppose to do
16:37 fission6 this is insane
16:37 _ikke_ Is the merge the last thing you did (except for the revert)?
16:37 fission6 i just made my prblem even more complex
16:37 fission6 there was one other small commit
16:38 fission6 _ikke_: http://dpaste.com/02S96QK
16:38 _ikke_ And you want to keep that?
16:38 fission6 i really dont care about it
16:39 fission6 OK _ikke_ another solution - my developer has master exactly where i want (pre merge) - is there a way to get his history of master upstream and then down to me
16:39 circ-user-7k4tY joined #git
16:39 fission6 (he hasn't pulled down any of my merge mess)
16:39 Rodya_ joined #git
16:40 kbs joined #git
16:41 _ikke_ You don;'t need his history
16:41 _ikke_ git reset --hard 752f15b430! would completely undo the merge
16:41 fission6 whats the easiest way to clean this up
16:41 arthurl joined #git
16:42 _ikke_ git reset --hard 752f15b43~1
16:42 fission6 its not any better to utilize the fact he doesn't have any of this crap in his master
16:42 fission6 what will this do, git reset --hard 752f15b43~1
16:43 _ikke_ It will reset your local master branch to before the merge
16:43 fission6 ok
16:43 _ikke_ fission6: branches are just pointers in git. You don't need his repository to move pointers :-)
16:43 fission6 i did that, now do i push upstream
16:43 fission6 Updates were rejected because the tip of your current branch is behind
16:44 fission6 i already pushed my mess upstream
16:44 fission6 i feel i should be utilizing his master since its in perfect state
16:45 _ikke_ fission6: Only one step and you're good to go
16:45 fission6 what do you advise next?
16:45 _ikke_ fission6: git push --force-with-lease origin master
16:46 fission6 what is this, --force-with-lease?
16:46 d0nn1e joined #git
16:46 _ikke_ safer version of --force
16:46 psprint joined #git
16:46 _ikke_ aborts when the remote has commits you don't have locally for that branch
16:46 psprint Hello. From what is "ref" abbrevated, in "reflog"?
16:46 fission6 i swear git is so great but when you step out of bounds its a syntax manual crazzzy ass world, its just to complex and to many options
16:46 akushner joined #git
16:47 grawity psprint: most things Git just call them "refs"
16:47 grawity psprint: short for commit references, I guess
16:47 grawity e.g. branches, tags
16:47 psprint grawity: are they related to "rev", revisions?
16:47 _ikke_ fission6: git is not a walled garden that forces you to work one way
16:47 fission6 _ikke_: thank you so much for your help. final question of the moment why did i original dude git revert and then git reset?
16:47 _ikke_ fission6: That comes with a price though
16:47 grawity psprint: probably not in the way you're imagining, no
16:48 _ikke_ fission6: reseting rewrites history
16:48 _ikke_ if other already fetched the commits and comitted on it, it'll become a mess when you rewrite history
16:48 fission6 so thats OK since my colleague didn't have the upstream?
16:48 _ikke_ correct
16:48 fission6 ok how come revert then wou;dn't let me pull in the branch - that to me sounds crazy
16:49 psprint grawity: but a revision is a ref, isn't it?
16:49 _ikke_ Because you don't unmerge it
16:49 grawity psprint: no
16:49 fission6 i didn't want at this moment, but i want it all in a few hours once a few more changes happen. in other words what do you do when you merge a branch prematurerly
16:49 grawity psprint: a branch name, or a tag name, would be a ref though
16:49 grawity psprint: refs generally are a way to attach names to revisions (commits)
16:49 _ikke_ fission6: The two options that were given here are your choices
16:49 grawity psprint: like hg bookmarks, I guess
16:50 grawity psprint: (thus the reflog is a history of where the ref used to point)
16:50 _ikke_ rev != ref
16:50 fission6 damn i would have thought i could strip a whole merge out, then just merge in the branch again later, right? that would seem like a reasonable need
16:50 _ikke_ fission6: All commits that come after the merge, rely on the merge commit
16:50 psprint ahso.. I'm looking for a common name for those things in my software. Up to this moment I was calling them refs. Branch name, tag name, sha hash. Turns out sha hash isn't correctly named by "ref"?
16:51 _ikke_ fission6: It's baked into the history of the repository
16:51 _ikke_ fission6: You cannot just remove a commit from in between
16:51 grawity psprint: I think "revision" is common
16:51 grawity psprint: e.g. in `man gitrevisions`
16:51 gitinfo psprint: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
16:51 _ikke_ fission6: You can do it in git by rewriting history, either with tools like git reset, or git rebase
16:52 link0802 joined #git
16:52 psprint grawity: thanks, I'll switch to "rev"
16:52 fission6 what happens if someone did pull down my --forced push
16:52 fission6 does it just rewrite their history, risking removing anything they've commited locally
16:53 grawity no, it merges both histories
16:53 jayjo joined #git
16:53 fission6 how by time?
16:53 fission6 grassass:
16:53 fission6 grawity:
16:53 grawity no, like `git merge`
16:53 grawity I mean, it *is* `git merge` in the end
16:54 ki0 joined #git
16:55 fission6 _ikke_: sure i can't remove a commit - but i can undo what a commit did in a new commit (isn't that what revert does or now)
16:55 fission6 no*
16:55 grawity you can
16:55 grawity though 'undoing' works best with regular commits; not so much for merges
16:55 _ikke_ fission6: That's exactly what git revert does
16:56 _ikke_ It undoes the changes a commit did, but not the fact that the merge happened
16:56 fission6 SO why can't i come back in a few hours and then remerge the branch, because "merge" already sees those commits in side of master
16:56 _ikke_ yes
16:56 fission6 hmm
16:56 psprint grawity: it's a cool thing that the three types of revisions can be used interchangeably, branch, tag, sha hash. Do you know some non-obvious place where this abstraction fails?
16:56 fission6 how are merges even determined, is time of commit involved?
16:57 grawity psprint: not really; pretty much any command I can think of that requires a commit will also accept a ref.
16:57 _ikke_ fission6: a merge commit is a commit that has two parents
16:57 ojacobson fission6: purely based on graph relationships (see !lol)
16:57 gitinfo fission6: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
16:57 _ikke_ from both branches one
16:57 grawity psprint: [there are also refs that *aren't* branches or tags]
16:57 _ikke_ fission6: let's demonstrate
16:57 psprint grawity: for example?
16:57 fission6 so time is not involved its just parents / graph relations
16:57 _ikke_ fission6: correct
16:58 watabou joined #git
16:58 _ikke_ .digraph C -> B -> A; G -> F -> E -> D -> A;
16:58 gitinfo .digraph: http://g.jk.gs/xo.png
16:58 grawity psprint: "refs/heads/": regular branches; "refs/tags/": tags; "refs/remotes/": remote-tracking branches (which do not get the special 'branch' treatment); "refs/notes/": a completely separate commit tree holding metadata; "refs/original/heads/": filter-branch backups...
16:59 grawity psprint: git show-ref, git ls-remote
16:59 _ikke_ fission6: This is an example where you have two branches
16:59 link0802 left #git
16:59 grawity "HEAD" is also technically a ref, though it's not under refs/
16:59 _ikke_ .digraph C -> B -> A; G -> F -> E -> D -> A; merge -> C; merge -> G;
16:59 gitinfo .digraph: http://g.jk.gs/xp.png
16:59 _ikke_ This is where you created the merge
17:00 _ikke_ fission6: Note how the merge commit references both branches
17:00 _ikke_ fission6: Following?
17:00 psprint grawity: thanks
17:00 fission6 yes
17:01 fission6 _ikke_: whats next
17:01 _ikke_ .digraph C -> B -> A; G -> F -> E -> D -> A; merge -> C; merge -> G; I -> H -> merge;
17:01 gitinfo .digraph: http://g.jk.gs/xq.png
17:01 _ikke_ You create some commits on top of the merge
17:01 _ikke_ Now you realize you want to revert the merge
17:02 _ikke_ .digraph C -> B -> A; G -> F -> E -> D -> A; merge -> C; merge -> G; I -> H -> merge; r[label="revert merge"]; r -> I
17:02 gitinfo .digraph: http://g.jk.gs/xr.png
17:02 _ikke_ You create the revert commit
17:02 grawity psprint: GitHub also hides pull requests under refs/pull/, it can be convenient
17:03 fission6 _ikke_: ok
17:03 tvon joined #git
17:04 _ikke_ Do you see that the branch is still merged in?
17:05 fission6 yes
17:05 ramsub07 joined #git
17:06 _ikke_ .digraph C -> B -> A; G -> F -> E -> D -> A; merge -> C; merge -> G; I -> H -> merge; r[label="revert merge"]; r -> I; K -> J -> C;
17:06 gitinfo .digraph: http://g.jk.gs/xs.png
17:06 _ikke_ You continue working on the branch
17:07 _ikke_ You merge the branch again:
17:07 Pande123 joined #git
17:08 fission6 ok
17:08 eletuchy joined #git
17:08 _ikke_ .digraph C -> B -> A; G -> F -> E -> D -> A; merge -> C; merge -> G; I -> H -> merge; r[label="revert merge"]; r -> I; K -> J -> C;sdasd(having connection issues)
17:08 prefix joined #git
17:08 gitinfo _ikke_: .digraph error processing the definition: Error: <stdin>:2: syntax error near line 2 | context: C -> B -> A; G -> F -> E -> D -> A; merge -> C; merge -> G; I -> H -> merge; r[label="revert merge"]; r -> I; K -> J -> >>>  C;sdasd( <<< having connection issues)
17:09 solars joined #git
17:10 watabou joined #git
17:12 _ikke_ .digraph C -> B -> A; G -> F -> E -> D -> A; merge -> C; merge -> G; I -> H -> merge; r[label="revert merge"]; r -> I; K -> J -> C; merge2 -> K; merge2 -> r
17:12 gitinfo .digraph: http://g.jk.gs/xt.png
17:12 _ikke_ 2nd merge
17:12 _ikke_ Git sees that only J and K have been added
17:12 _ikke_ So those changes get merged in
17:12 cdown joined #git
17:12 _ikke_ but C and B are already merged in for all git knows
17:13 fission6 ok visually i get it, thank you _ikke_
17:14 fission6 i guess the moral is dont merge a branch until you are sure otherwise you are either 1) rewriting history or 2) need to find a way to redo code you undid
17:14 Silenced joined #git
17:15 nick123 joined #git
17:15 _ikke_ fission6: Note that what I said earlier is also valid, you can revert the revert again to get the changes from the first merge back
17:15 fission6 thats option 2 right
17:15 _ikke_ right
17:15 fission6 hmm ok thanks _ikke_ very helpful and paitent much appreciated
17:15 nettoweb joined #git
17:16 _ikke_ And once you push changes, it's harder to undo
17:16 _ikke_ As long as it's only local, you can do with it what you want
17:16 fission6 _ikke_: yea
17:16 nnyk_ joined #git
17:16 fission6 cause rewriting history doesn't matter until its "public"
17:17 fission6 its not really history until it is, kind of
17:17 fission6 philosophically speaking
17:17 _ikke_ It's only *your* history
17:17 fission6 ya
17:18 hahuang61 joined #git
17:18 Samual joined #git
17:18 davisonio joined #git
17:18 fission6 alrighty given that i am somewhat back in steady state gonna keep humming along thanks
17:18 _ikke_ Succes
17:18 synthroi_ joined #git
17:19 fission6 ya, one finally question is why does github say the pull request is merged with the branch i just reset out of master?
17:21 thiago if it's merged once, it's merged forget
17:21 _ikke_ I don't think github automatically opens PRs again
17:22 SirFunk_ I have a blob sha for a file that should have been filtered out of my repo. When I do something like this: http://stackoverflow.com/a/223890/907035 to see what commits have that blob in their tree it shows a ton of things. When I get one of those commits and do `git branch -a --contains` it shows nothing containing that commit. How can I find out what is still referencing that blob?
17:23 fission6 thiago _ikke_: makes sense
17:23 alip joined #git
17:23 thiago merged forever, I meant
17:23 thiago you can't un-merge
17:24 _ikke_ He forced pushed the branch back to before the merge
17:25 dreiss joined #git
17:27 benaiah joined #git
17:28 rkazak joined #git
17:28 nick123 joined #git
17:30 aard_ joined #git
17:31 benaiah so, I created a branch for a new build system a while ago, but we couldn't finish the work at that time. I just checked it out and ran "git rebase master", and now my local copy of the new-build-system branch has wildly diverged from origin/new-build-system due to the 200-odd commits from master that I just rebased onto. Is there a way to safely update origin/new-build-system, or should I remove it from origin
17:31 benaiah entirely (I'm all but certain nobody else has used this branch) and recreate it from my local copy? Apologies if this is a trivial question, I'm fairly new to rebasing.
17:31 sasha- joined #git
17:32 _ikke_ benaiah: There is no difference between force pushing or deleting and recreating it
17:34 Jbhn joined #git
17:34 lindenle joined #git
17:34 Silenced joined #git
17:35 zeemz joined #git
17:35 kaldoran joined #git
17:36 phanimahesh joined #git
17:38 Pandeee joined #git
17:38 Pandeee test
17:38 GodGinrai joined #git
17:39 Pandeee Hi all, I've got a little problem with trying to track files. There's a directory that it just won't track no matter what. Everything I found online hasn't worked. Anyone available to help? much appreciated
17:39 _ikke_ Git does not track empty directories
17:39 Pandeee It looks like this: directory -> directory -> all the files that are untracked
17:40 _ikke_ Does there happen to be a .git directory somewhere?
17:40 Pandeee so should I put a little readme or something in each directory that?
17:40 Pandeee Yes there is
17:40 Pandeee project-root/.git/
17:41 Pandeee I deleted that lock file in there
17:41 _ikke_ git automatically ignores other repoistories
17:41 benaiah _ikke_: so after a "git push --force" the remote will end up with exactly what I have, right? I just made sure there are no commits there I didn't already have when I rebased
17:41 MZAWeb joined #git
17:41 Pandeee yes I initialized git while in the project root directory
17:43 Sasazuka joined #git
17:43 Pandeee I also tried changing the directory into the sub directory where all the files were, and doing an git add .
17:43 Pandeee but still didn't work
17:43 Pandeee and git add -a
17:43 EvilPenguin joined #git
17:44 internetbird joined #git
17:45 _ikke_ Ok, but not in one of the subdirectories?
17:45 psprint left #git
17:48 cdown joined #git
17:48 Jason_ joined #git
17:49 davisonio joined #git
17:52 rahtgaz joined #git
17:54 troulouliou_div2 joined #git
17:55 arooni joined #git
17:56 diegoviola joined #git
17:58 d4rklit3 joined #git
17:58 synthroid joined #git
17:59 rubyonrailed joined #git
18:02 fantasy_epic|2 joined #git
18:02 User458764 joined #git
18:03 stantonk joined #git
18:07 Ariadeno joined #git
18:07 eletuchy joined #git
18:12 xaviergmail joined #git
18:13 jayjo When I run git clone, I get the error Problem with the SSL CA cert (path? access rights?)
18:13 jayjo is this a common issue?
18:14 nnyk joined #git
18:14 FunkyAss joined #git
18:15 GavinMagnus joined #git
18:16 _ikke_ not really. What error?
18:17 Rodya_ joined #git
18:19 fuchstronaut joined #git
18:19 mdw joined #git
18:19 Dyonisos joined #git
18:20 Dyonisos joined #git
18:20 jost__ joined #git
18:20 Doginal joined #git
18:22 watabou joined #git
18:24 Rodya_ joined #git
18:25 fission6 when i do git status on a server which hosts my web app, i get Your branch is ahead of 'origin/master' by 57 commits.
18:25 fission6 im not sure why its not exactly in line with upstream, how can i find out
18:26 fission6 i also noticed when i did my last git pull it had me do a merge essentiall and had to enter in a comment in emacs
18:28 lvns joined #git
18:28 btree joined #git
18:29 qsx !deploy
18:29 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
18:29 PsionTheory joined #git
18:31 AaronMT joined #git
18:36 phanimah1sh joined #git
18:36 GodGinrai qsx: but what about git-doeverythingforme? :P
18:37 mehola joined #git
18:39 _ikke_ Feature was rejected
18:40 fission6 lets ignore the deployment part for now, curious why i am getting that something is ahead of master and how can i show what it thinks it has that master doesn't
18:40 fission6 _ikke_: i think this may be an artifact based on our earlier work
18:40 ntonjeta joined #git
18:40 _ikke_ fission6: I think because something was merged in
18:40 ynanm joined #git
18:41 fission6 very weird
18:41 fission6 i think i may just blow the repo away and clone it
18:41 fission6 i think that should set it straight?
18:41 fission6 it looks like it has one extra commit at the top regarding a merge
18:41 fission6 how can i see what went into that commit/merge
18:42 fission6 'Merge branch 'master' of ' from [upstream]
18:42 jceb joined #git
18:42 fission6 this must have been from the --force or something
18:42 CJKinni joined #git
18:42 qsx GodGinrai: systemd-gitd?
18:43 _ikke_ fission6: did you do a git pull in that repository?
18:43 fission6 yea
18:43 kervan joined #git
18:43 kervan joined #git
18:43 kervan joined #git
18:43 fission6 and it made me put a merge commit message
18:43 _ikke_ Yeah, that means you merged commits in
18:43 fission6 which was odd, not this one repo has an extra commit in it
18:44 fission6 normally it just fast forwards (not sure if thats the right term)
18:44 _ikke_ yes, that's the correct term
18:44 fission6 Merge branch 'master' of github.com:whatever/repo
18:44 Ahmed90 joined #git
18:44 fission6 why is this though, i dont think this should be here
18:44 fission6 no other repos have this
18:45 _ikke_ did you alread pull the merge on that repo?
18:45 fission6 i guess
18:45 fission6 yes
18:45 fission6 the merge i wanted to undo i think so
18:45 fission6 my colleague did not but my demo environment i did
18:46 _ikke_ Right, that caused
18:46 _ikke_ it
18:46 _ikke_ resetting it to upstream would fix it
18:46 stuh84 joined #git
18:46 _ikke_ That's the mess I was talking about you would get by rewriting history
18:46 fission6 ya
18:47 fission6 ok so what path should i take _ikke_
18:47 ekinmur joined #git
18:47 MZAWeb joined #git
18:48 bdb-me joined #git
18:49 Segore left #git
18:49 zivester joined #git
18:49 _ikke_ git reset --hard <remote_tracking_branch> would fix it
18:51 Doginal joined #git
18:52 fission6 so does this rewrite history just like before but sync the twos history
18:52 lvns joined #git
18:52 _ikke_ It rewrites local history
18:53 fission6 git reset --hard origin/master worked!
18:53 fission6 thank you
18:56 mwhooker joined #git
18:58 ajf- joined #git
18:58 sanketdg joined #git
19:01 dsdeiz joined #git
19:01 dsdeiz joined #git
19:01 jstein_ joined #git
19:02 ekinmur joined #git
19:02 swati_27 joined #git
19:04 Sucks joined #git
19:05 stantonk joined #git
19:09 davisonio joined #git
19:11 dan2k3k4 joined #git
19:12 GodGinrai qsx: I'm sure it will happen eventually
19:12 GodGinrai qsx: right after systemd-kernel
19:13 Raging_Hog joined #git
19:13 qsx well that certainly won’t happen
19:13 GodGinrai omnomnom
19:13 GodGinrai ;)
19:17 Jason_ joined #git
19:18 jchonig joined #git
19:21 ki0 joined #git
19:22 thermyte joined #git
19:22 watabou joined #git
19:22 dan2k3k4 joined #git
19:23 mischat joined #git
19:24 livingstn joined #git
19:25 Rodya_ joined #git
19:26 stonerfish joined #git
19:27 nettoweb joined #git
19:30 lvns_ joined #git
19:30 emPi joined #git
19:34 phanimahesh joined #git
19:35 nb_bez___ joined #git
19:35 EvilPenguin joined #git
19:36 stantonk joined #git
19:37 weox joined #git
19:39 GavinMagnus left #git
19:40 Psychiatrist joined #git
19:40 erguven joined #git
19:40 satifant joined #git
19:40 mdw joined #git
19:41 vuoto joined #git
19:45 erguven joined #git
19:45 rnsanchez_ joined #git
19:48 pungi-man joined #git
19:49 jstein_ joined #git
19:50 ntonjeta joined #git
19:50 netj joined #git
19:50 jimmyeatworld joined #git
19:50 elastix joined #git
19:50 nidr0x joined #git
19:51 dan2k3k4 joined #git
19:52 mwhooker joined #git
19:52 nidr0x joined #git
19:53 docnvk joined #git
19:53 bambams joined #git
19:54 cdown joined #git
19:55 alex1a joined #git
19:56 eletuchy joined #git
19:56 Jason_ joined #git
19:58 zumba_addict joined #git
20:01 demiro joined #git
20:02 d4rklit3 joined #git
20:04 xpk joined #git
20:04 elementalest joined #git
20:04 elementalest joined #git
20:07 solars joined #git
20:09 stonerfish joined #git
20:11 clime_ joined #git
20:12 clime joined #git
20:13 clime left #git
20:14 zumba_addict joined #git
20:15 solars joined #git
20:16 joe9 joined #git
20:17 nnyk joined #git
20:17 ansimation joined #git
20:18 ansimation joined #git
20:21 joe9 I am trying to apply a patch to a git tree and get this message: http://codepad.org/XJ2LDY2O . Just wanted to check if there is a better way to merge this patch manually?  I can do the changes of the patch manually. but, am looking for something that can make the task easier/shorter as I have to apply the same patch on multiple computers and they might all fail with different such reasons?
20:22 piattino joined #git
20:23 _ikke_ joe9: What sometimes helps is to use -3 (3-way merge)
20:23 raijin joined #git
20:24 watabou joined #git
20:24 keltvek joined #git
20:24 _ikke_ But other then that, conflicts are conflicts
20:26 Rodya_ joined #git
20:26 KeyWeeUsr joined #git
20:27 KeyWeeUsr hi there! is there something like git diff for a line? e.g. https://github.com/KeyWeeUsr/KV-for-NotepadPP/c​ommit/797c9b412b1b5bef7c19766f9e317b4efd5f3797 I want to see what exactly has been changed in the line
20:27 m0viefreak joined #git
20:28 fission6 joined #git
20:28 KeyWeeUsr I know it _shows_ me it, but not the _nice_ way i.e. what words were added and similar stuff
20:28 _ikke_ KeyWeeUsr: git diff --color-words
20:29 KeyWeeUsr hm, let me try. how can I diff two branches?
20:29 stantonk joined #git
20:30 Sasazuka joined #git
20:30 KeyWeeUsr got it
20:30 hahuang61 joined #git
20:30 KeyWeeUsr _ikke_: thanks very much :)
20:34 swati_27 left #git
20:34 Jason_ joined #git
20:34 phanimah1sh joined #git
20:38 mehola joined #git
20:39 solars joined #git
20:39 SirFunk_ I filtered my repo with: `git filter-branch --prune-empty --tag-name-filter cat --subdirectory-filter my_folder -- --all` I still have tags left  that reference the old filestructure that should be gone though. Is there any way to clean this up?
20:39 osse SirFunk_: do the refs start with refs/original by any chance?
20:39 yqt joined #git
20:40 joe9 _ikke_: Thanks for your comments. I understand that there are conflicts and are hard to merge automatically. Just want to check if there is a process/command to run the merge manually or such.
20:40 SirFunk_ how do I get the refs from a tag?
20:40 joe9 _ikke_: Something that can help ease the process.
20:40 osse SirFunk_: git rev-parse --symbolic-full-name tag
20:41 SirFunk_ osse: no, refs/tags/
20:41 boombatower joined #git
20:41 FuzzySockets joined #git
20:42 SirFunk_ what does subdirectory filter do if the subdirectory doesn't exist? does it discard the commit or keep it. That might be my problem if it keeps it
20:42 ekinmur joined #git
20:42 rahtgaz joined #git
20:43 artemisart joined #git
20:43 eijk_ joined #git
20:46 prefix joined #git
20:48 LaptopBrain joined #git
20:49 mischat joined #git
20:50 eletuchy joined #git
20:51 nettoweb joined #git
20:54 d4rklit3 joined #git
20:54 cr3 joined #git
20:55 mwhooker joined #git
20:55 cr3 hi folks, if I made a few commits in my local master that I actually want in another branch, how should I move those commits?
20:55 osse cr3: a pre-existing branch or a new branch
20:56 osse `?
20:56 cr3 osse: a new one that I actually forgot to create in the first place :(
20:56 osse cr3: https://raw.githubusercontent.com/Osse/gi​t-stuff/master/git-reset-explanation.txt
20:56 WifiBrain joined #git
20:56 cr3 osse: I get it, thanks!
20:57 jimi_ joined #git
20:57 ahr3n joined #git
20:58 fuchstronaut joined #git
21:00 fission6 joined #git
21:02 ExoUNX joined #git
21:03 eijk_ joined #git
21:04 linx joined #git
21:04 ScottG_ joined #git
21:05 ScottG_ left #git
21:05 ScottG489 joined #git
21:06 ScottG489 Is there a way to line-by-line select what I want to commit?
21:06 thermyte joined #git
21:06 ojacobson git add --patch
21:06 osse ScottG489: almost. git add -p, split hunks if necessary
21:06 rgrinberg joined #git
21:06 ojacobson the UI is not exactly friendly, but that's the tool
21:06 osse then press e when you can't split no mo
21:06 linx joined #git
21:07 ScottG489 Damn so it only lets me do it on a hunk basis?
21:07 _ikke_ with the editor you can do it line by line
21:07 osse you missed the part where I said press e
21:07 _ikke_ but it's basically editing a patch
21:07 osse gitk can do this afaik
21:07 ScottG489 ohhh i see
21:08 ScottG489 e is for editor
21:08 eijk_ joined #git
21:09 _ikke_ osse: git gui
21:09 GodGinrai cr3: did you already reset?
21:09 cr3 GodGinrai: not yet, what's up?
21:10 GodGinrai cr3: if you `git checkout -b newbranch`, then checkout master and reset master, you will have those commits in a "branch based off of master" ;)
21:10 fracting joined #git
21:11 osse that's similar to what i suggested but with an extra step
21:11 osse in other words, i rule and you drool
21:11 osse Woooo!!!
21:11 cr3 GodGinrai: thanks, I'm still not very comfortable with git so I appreciate examples like this to reinforce my understanding (rather than just copy/paste recipes)
21:12 stantonk joined #git
21:12 cdown_ joined #git
21:13 GodGinrai cr3: np :)
21:13 btree left #git
21:14 ki0 joined #git
21:15 asdf_ joined #git
21:16 m0viefreak joined #git
21:16 jfetter joined #git
21:18 thermyte_ joined #git
21:18 vuoto joined #git
21:22 chrisshattuck joined #git
21:23 davisonio joined #git
21:25 Rodya_ joined #git
21:27 watabou joined #git
21:27 HoierM joined #git
21:27 thermyte joined #git
21:28 editshare-ericf joined #git
21:34 linx joined #git
21:34 m0viefreak joined #git
21:34 tvon joined #git
21:35 ki0 joined #git
21:36 Ph_ joined #git
21:36 cr3 osse: in your link, you have `git reset --hard C` but I get: fatal: ambiguous argument 'C': unknown revision or path not in the working tree.
21:36 cr3 osse: did you mean HEAD?
21:37 cr3 osse: oh wait, I see what C is supposed to be. nevermind :)
21:38 osse cr3: yeah it's not perfect. the only intended difference between yours and mine is that I suggest 'git branch foo' instead of 'git checkout -b foo; git checkout master'
21:38 osse oops
21:38 osse for some reason I thought you were GodGinrai
21:38 LaptopBrain joined #git
21:39 GodGinrai osse: just so used to using checkout -b instead of branch
21:39 cr3 osse: I got the general idea though and I was actually thinking of your option at first, I just didn't have the experience to try it out.
21:39 GodGinrai since I normally want to do something in the branch when I make it
21:40 cr3 thanks again folks, cheerio!
21:40 inflames joined #git
21:40 GodGinrai osse: Didn't actually look at your git reset explanation, so I was just assuming it was just an explanation of how to reset. (not how to preserve the changes as well)
21:42 englishstudent joined #git
21:42 arahael left #git
21:43 cdown joined #git
21:44 eletuchy joined #git
21:45 BlessJah joined #git
21:46 jeffreylevesque joined #git
21:48 maestrojed joined #git
21:49 st0opkid joined #git
21:49 st431 joined #git
21:49 fracting joined #git
21:51 st431 http://pastie.org/private/tmqlvnydqzwjvduhfw7hg#1,31,100,130,132
21:51 st431 how do i fix this
21:52 st431 git pull removed everything
21:52 eletuchy joined #git
21:53 rudi_s st431: Undo the git pull (merge). git reset --hard @~ - but make sure you backup a !backup beforehand.
21:53 gitinfo st431: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
21:54 st431 http://pastie.org/private/or4t5avqsq3syrpjfiav2q
21:54 st431 this is the git status
21:55 fahadash joined #git
21:56 st431 git reset --hard @~ -
21:56 st431 rudi_s, i am get this error "fatal: Cannot do hard reset with paths"
21:57 st431 Your branch is behind 'origin/master' by 15 commits, and can be fast-forwarded.
21:57 st431 :S
21:58 ahmed_elgabri joined #git
21:59 joki joined #git
22:00 mingrammer_ joined #git
22:02 eletuchy joined #git
22:02 stantonk joined #git
22:02 st431 someone please
22:03 aidalgol joined #git
22:03 ojacobson st431: the trailing dash is a path
22:03 ojacobson you can't reset --hard to a revision _and_ reset a single path
22:04 johnmilton joined #git
22:05 rudi_s st431: Sorry, just git reset --hard @~
22:05 rudi_s (The - was meant to separate the command from the rest of the sentence.)
22:05 st431 i tried that and lost everything and its says 15 commit behind
22:06 rudi_s st431: "lost everything"?
22:06 st431 our branch is behind 'origin/master' by 15 commits, and can be fast-forwarded.
22:06 rudi_s gitk --all to get a good overview what's going on.
22:09 fuchstronaut joined #git
22:10 espindola joined #git
22:10 st431 i solved it
22:10 st431 thank you
22:11 rudi_s np
22:16 peepsalot how can i undo a commit that hasn't been pushed, but also was not the latest commit, such that it won't be in history
22:16 fission6 joined #git
22:16 xlegoman joined #git
22:17 CheckDavid joined #git
22:20 circ-user-7k4tY joined #git
22:20 rudi_s peepsalot: git rebase -i commit-before-that-commit
22:20 rudi_s And then just drop the line containing the commit - this will remove it (completely).
22:21 GodGinrai ehh
22:21 GodGinrai I'm not sure that removes it completely
22:21 alfy joined #git
22:21 GodGinrai reference?
22:22 GodGinrai peepsalot: easiest way to take it out of the history is just using git reset. `git reset --hard HEAD~1` will set the pointer for the branch to the previous commit.
22:23 peepsalot GodGinrai, but there are commits after that one that i want to keep
22:23 inflames joined #git
22:23 peepsalot hence "not the latest commit"
22:24 GodGinrai peepsalot: ah, whoops, missed the part about "not the latest commit"
22:25 GodGinrai peepsalot: then yea, interactive rebase probably is the right way for that case.
22:26 GodGinrai peepsalot: because all of the commits after that commit will need to be rebased off of its previous commit
22:26 peepsalot ok
22:27 Infamous joined #git
22:28 mmlb joined #git
22:29 rudi_s GodGinrai: Well, "completely" as in it's not part of the current visible history. The objects of course stay in the git tree (and still reachable via git reflog) unless gced.
22:30 peepsalot ok, i did it! thanks rudi_s
22:30 njt joined #git
22:30 kenansulayman joined #git
22:30 GodGinrai rudi_s: yea, that's what I was thinking
22:30 ajf- joined #git
22:31 SwiftMatt joined #git
22:31 rudi_s np
22:33 watabou joined #git
22:34 mwhooker joined #git
22:36 ochorocho__ joined #git
22:38 jottr joined #git
22:38 tanuki joined #git
22:39 Wind0r joined #git
22:39 mehola joined #git
22:39 tgunr joined #git
22:40 Jason_ joined #git
22:41 batrick joined #git
22:44 EvilPenguin joined #git
22:45 albel727 joined #git
22:47 axiom_1 joined #git
22:48 hahuang61 joined #git
22:49 nettoweb joined #git
22:50 xall joined #git
22:52 Sasazuka joined #git
22:53 Electrometro joined #git
23:01 xaviergmail joined #git
23:08 kfunk joined #git
23:08 sagerdearia joined #git
23:11 Topic for #git is now Welcome to #git, the place for git help and unchanged topics | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-fetch: no training required
23:11 Eugene I should really write a bot plugin to do that
23:11 ajf- joined #git
23:12 espindola joined #git
23:12 Rikairchy joined #git
23:13 cdg joined #git
23:15 grubles joined #git
23:15 ThiefMaster joined #git
23:16 ajf- joined #git
23:17 Grum joined #git
23:18 mablae__ joined #git
23:21 j416_ joined #git
23:21 zumba_addict joined #git
23:23 eletuchy joined #git
23:26 eletuchy_ joined #git
23:26 thiago joined #git
23:26 lvns joined #git
23:26 sagerdearia joined #git
23:27 sauvin joined #git
23:27 grubles joined #git
23:28 tvon joined #git
23:28 rolha joined #git
23:29 mwhooker joined #git
23:29 eletuchy joined #git
23:30 NeverDie joined #git
23:31 NeverDie joined #git
23:32 eletuchy_ joined #git
23:34 j416 joined #git
23:34 watabou joined #git
23:35 jalnt joined #git
23:35 eletuchy joined #git
23:35 j416 joined #git
23:38 eletuchy_ joined #git
23:40 Rodya_ joined #git
23:42 eletuchy joined #git
23:44 eletuchy_ joined #git
23:44 rkazak joined #git
23:45 xall joined #git
23:46 jeffmjack joined #git
23:46 jeffmjack if you `git pull` and come up with a bunch of conflicts, what's the rebase command to just undo it?
23:47 eletuchy joined #git
23:49 nettoweb joined #git
23:49 hahuang61 joined #git
23:50 mda1 joined #git
23:50 eletuchy_ joined #git
23:51 rewt undo what?
23:51 osse jeffmjack: I think you want git merge --abort
23:51 osse not a rebase command but
23:51 jeffmjack ah cool
23:51 jeffmjack yeah that sounds about right
23:52 eletuch__ joined #git
23:52 elastix joined #git
23:53 mda1 joined #git
23:55 eletuchy joined #git
23:55 izabera i have a problem with a sparse checkout
23:55 izabera this is the error message i get    error: Sparse checkout leaves no entry on working directory
23:57 zumba_addict joined #git
23:58 eletuchy_ joined #git
23:58 izabera i created the repo, ran git config core.sparsecheckout true, added the remote url, added the directory i want in .git/info/sparse-checkout
23:58 izabera trying to pull reports that error
23:58 f3r70rr35f joined #git

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