Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-16

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

All times shown according to UTC.

Time Nick Message
00:01 baba_ joined #git
00:01 _28_ria joined #git
00:02 jon-mac joined #git
00:03 mattfoo joined #git
00:05 clemf joined #git
00:06 rkazak joined #git
00:08 ceaucari joined #git
00:10 aizex joined #git
00:12 jonmorehouse joined #git
00:15 ril joined #git
00:15 eletuchy joined #git
00:22 m_antis joined #git
00:24 FuzzySockets joined #git
00:24 eka joined #git
00:27 mischat joined #git
00:30 Gsham joined #git
00:30 jonmorehouse joined #git
00:31 ochorocho__ joined #git
00:31 tomog999_ joined #git
00:32 dreiss joined #git
00:32 MattMaker joined #git
00:33 LaT0rtue joined #git
00:36 livingstn joined #git
00:38 MattMake_ joined #git
00:41 MattMaker joined #git
00:46 andyhoang-work joined #git
00:46 bitkiller joined #git
00:46 fahadash joined #git
00:46 MattMaker joined #git
00:48 MattMaker joined #git
00:49 andyhoang joined #git
00:51 fuchstronaut joined #git
00:57 Puffball joined #git
00:58 AciD` joined #git
00:58 Asiajey joined #git
00:59 jonmorehouse joined #git
00:59 AciD` hey, having A <- B <-C (branch foo), and A <- D (master), how can I 'move' the commit from foo onto master (while still having uncommited files in foo)?
01:00 AciD` so I get A <- B <- D <- C (master)
01:00 AciD` and just A <- uncommited files on foo?
01:03 ceaucari joined #git
01:05 dermoth__ joined #git
01:06 ekinmur joined #git
01:11 thiago AciD`: first of all, commit what's uncommitted
01:11 pks joined #git
01:11 thiago AciD`: which commit is youngest, A or C?
01:11 ojacobson yeah, any kind of history restructuring is going to make use of the work tree
01:11 ojacobson you want it clean
01:11 aizex joined #git
01:11 mizu_no_oto joined #git
01:13 CussBot joined #git
01:14 jaguarmagenta joined #git
01:16 mischat joined #git
01:16 alex1a joined #git
01:28 dsantiago joined #git
01:31 unbalancedparen joined #git
01:32 relipse2 is there an easy way to undo a branch merge?
01:33 d0nn1e joined #git
01:33 Vaelatern joined #git
01:34 Th0bse joined #git
01:40 dreiss_ joined #git
01:40 m1dnight_ joined #git
01:40 xall joined #git
01:46 tobyn joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and tig welding | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Error: insufficient entries in https://madeitwor.se/git-jokes
01:51 cdg joined #git
01:51 wloncom joined #git
01:52 fuchstronaut joined #git
01:55 ecksit joined #git
01:55 ojdo joined #git
01:56 ecksit morning folks - just wondering if anyone has a way of using github pull request ID's as a beginning of a git commit line? example https://gist.github.com/jacobbednarz/a91e36b9fc8589dfeea658fa0e19375b
01:57 ceaucari joined #git
01:57 ecksit the issue is trying to escape the # since that's read as a comment in git
01:58 ecksit i see there is an option `core.commentchar` to change the character but i don't mind it usually so maybe escaping is easier?
01:59 tgunr joined #git
02:00 Gsham joined #git
02:01 ojacobson I've seen "[#1234] Summary line here" in the wild. Beyond that, I don't see any options to escape the #: any non-whitespace character before the # will make the whole line non-commentary.
02:01 ojacobson man git-commit and grep for "cleanup" for details
02:01 gitinfo the git-commit manpage is available at http://jk.gs/git-commit.html
02:02 Goplat joined #git
02:03 joki joined #git
02:05 CheckDavid joined #git
02:07 ToBeCloud joined #git
02:09 dreiss joined #git
02:11 Levitator joined #git
02:14 chigang_ joined #git
02:15 Buk joined #git
02:16 sssilver joined #git
02:17 Buk anyone know their way around the git-add-interactive perl script?
02:17 kadoban joined #git
02:22 xall joined #git
02:22 The_Phoenix joined #git
02:23 fahadash I have 96 changes, out of which I would like to stage 93, and leave out 3 files... If I pick and choose and do git add on each of the 93, It will take me a whole day. Is there any way to say add these except these 3?
02:23 The_Phoenix joined #git
02:24 rkazak joined #git
02:24 The_Phoenix joined #git
02:26 outsider joined #git
02:26 The_Phoenix joined #git
02:26 mizu_no_oto joined #git
02:27 The_Phoenix joined #git
02:28 hexagoxel joined #git
02:28 The_Phoenix joined #git
02:30 The_Phoenix joined #git
02:31 baba_ joined #git
02:32 ochorocho__ joined #git
02:33 bronson joined #git
02:34 daynaskully joined #git
02:36 chachasmooth joined #git
02:38 mmlb joined #git
02:38 hendry joined #git
02:39 skylite joined #git
02:40 amdi_ joined #git
02:40 eletuchy joined #git
02:41 hendry i have a branch where i've made a few commits over master. but i want to rewrite/"neaten up" the commits, what command & from which branch do i run it from?
02:46 Gsham joined #git
02:46 Th0bse joined #git
02:46 rgrinberg joined #git
02:48 yaewa joined #git
02:49 tomboy65 rebase -i COMMIT_FROM_WHERE_TO_START_NEATEN
02:50 tomboy65 git rebase ...
02:50 tomboy65 can also be compared to another branch
02:50 andyhoang joined #git
02:51 jstimm joined #git
02:53 fuchstronaut joined #git
02:53 hendry and I guess I should make a copy of the branch in case I mess up too right? can't see a way to readily undo
02:56 jaguarmagenta joined #git
02:57 gravitron joined #git
02:57 gravitron joined #git
02:57 clemf joined #git
02:57 josuebrunel joined #git
02:58 cyan__ joined #git
02:58 mwhooker joined #git
03:01 ojacobson you can make a second branch, or you can use the reflog to find the old branch tip after the fact
03:01 ojacobson either way works
03:01 harish joined #git
03:02 aavrug joined #git
03:02 arescorpio joined #git
03:05 Technocrat7 joined #git
03:08 eletuchy joined #git
03:09 d4rklit3 joined #git
03:14 aizex joined #git
03:16 digidog_ joined #git
03:20 amdi_ joined #git
03:20 mwhooker joined #git
03:21 elementalest joined #git
03:25 thinsoldier joined #git
03:25 eletuchy joined #git
03:25 thinsoldier The actual “.git” data of a submodule should be located in ./git/modules/ of the parent project yes?
03:26 mizu_no_oto joined #git
03:27 elementalest joined #git
03:27 elementalest joined #git
03:28 ojacobson that's where git-submodule puts it
03:28 garyserj joined #git
03:29 thinsoldier Any reason why it would not put them there?
03:29 thinsoldier I have older projects with their submodule data within the .git/modules/ folder
03:30 thinsoldier but a recent project i just cloned to the live server is putting each submodule’s .git folder within the submodlue folder itself
03:30 thinsoldier for reasons I don’t know
03:30 elementalest joined #git
03:30 elementalest joined #git
03:30 thinsoldier ./submod3/.git should be a text file but instead they are actual .git folders
03:31 anu0 joined #git
03:33 citizen-stig joined #git
03:33 elementalest joined #git
03:35 DolpheenDream joined #git
03:35 PCatinean joined #git
03:39 elementalest joined #git
03:39 jonmorehouse joined #git
03:40 elementalest joined #git
03:41 rchavik joined #git
03:45 eletuchy joined #git
03:48 johnny56_ joined #git
03:49 texinwien_ joined #git
03:53 tobyn left #git
03:54 fuchstronaut joined #git
03:54 nilg joined #git
03:55 jonmorehouse joined #git
03:56 elementalest joined #git
03:57 sssilver joined #git
04:00 a_thakur joined #git
04:05 jokester joined #git
04:10 jaguarmagenta joined #git
04:12 mehola joined #git
04:14 a_thakur joined #git
04:18 fscala joined #git
04:22 eletuchy joined #git
04:26 a_thakur_ joined #git
04:28 nnyk joined #git
04:31 Limes__ joined #git
04:32 briankc joined #git
04:34 d4rklit3 joined #git
04:34 ochorocho__ joined #git
04:35 eka_ joined #git
04:36 bronson joined #git
04:36 netj joined #git
04:39 xreal_alt joined #git
04:45 Aboba joined #git
04:49 Levitator Can you git add a symlink? git seems to be ignoring them.
04:49 Cabanossi joined #git
04:51 andyhoang joined #git
04:55 fuchstronaut joined #git
04:56 Eugene Levitator - git tracks symlinks just fine. Are you trying to add something matched by gitignore, perhaps? !transcript
04:56 gitinfo Levitator: Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
04:56 subhojit777 joined #git
05:00 subhojit777 joined #git
05:05 eka_ joined #git
05:06 mehola joined #git
05:12 aavrug joined #git
05:13 Bodger joined #git
05:13 mwhooker joined #git
05:14 smokeysea joined #git
05:14 smokeysea hello all, is there any way to find out changes in remote repo in some time line (sorted by change time)?
05:15 nidr0x joined #git
05:16 aizex joined #git
05:16 kadoban smokeysea: You're probably looking for some invocation of 'git log', but I'm not sure what you mean by "in some time line"
05:16 eletuchy joined #git
05:16 jokester joined #git
05:17 kadoban man gitrevisions could be helpful, it specifies some ways to specify what you want to git log, also !lol could help
05:17 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
05:17 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
05:17 smokeysea kadoban: thanks
05:19 a_thakur joined #git
05:20 citizen-stig joined #git
05:21 Levitator Hrm. I think my problem may have to do with the fact that I replaced an ordinary file with a symlink and git sees it as a replacement rather than a change.
05:24 thiago Levitator: because it is
05:26 MutantMahesh joined #git
05:26 Levitator Well, it's not, int he sense that the files have the same name.
05:27 thiago so it's not at all the same content, for a file that has the same name
05:27 thiago => replacement
05:27 thiago it's not even the same file type
05:27 GT joined #git
05:27 jonmorehouse joined #git
05:28 a_thakur joined #git
05:28 Nitesh joined #git
05:28 Levitator Yeah, well, it's a significant surprise, since I didn't know that the file's underlying filesystem type was a factor in its identity.
05:29 thiago only symlinks
05:29 thiago git stores the type and the target path
05:30 Levitator Ok, so, it's a special case.
05:32 bazzy left #git
05:32 thiago storing character specials, block devices, FIFO or sockets wouldn't make sense
05:33 thiago they can't be stored
05:33 Levitator You could store the contents of a named pipe up until EOF.
05:33 thiago there's no guarantee that reading it twice yields the same content
05:34 thiago hence, can't be stored
05:34 Raging_Hog joined #git
05:35 Levitator Yeah, but if they were so different, they wouldn't all be files. That's the point of filesystem abstraction.
05:36 Levitator You CAN get a finite amount of data out of pretty much any file, and it may or may not be predictable, depending on context.
05:36 Levitator Anyway, I'm pretty sure there's some reason for the symlink case, but I don't care to chase it down. It's just useful to know.
05:38 rkazak joined #git
05:39 thinsoldier joined #git
05:41 OnBrokenWings joined #git
05:43 LucaTM joined #git
05:43 eletuchy joined #git
05:47 akiva joined #git
05:48 mda1 joined #git
05:50 ril joined #git
05:51 bojangles joined #git
05:52 bojangles is it possible to remove your attempted commits and just pull the most recent version?
05:53 Levitator Well, "attempted" commits don't need to be removed because they don't exist.
05:53 mariuscc joined #git
05:53 ceaucari joined #git
05:53 grawity assuming that by "most recent version" you mean origin/master, you're looking for `git fetch origin; git reset --hard origin/master`
05:54 bojangles splendid, thanks grawity & Levitator
05:55 fuchstronaut joined #git
05:57 nischay joined #git
05:57 Lvjasha joined #git
06:01 rscata joined #git
06:05 tobyn joined #git
06:05 qt-x joined #git
06:07 bojangles left #git
06:07 tinajohnson___ joined #git
06:08 tobyn joined #git
06:11 nischay left #git
06:12 gabord joined #git
06:13 gabord Hi, is there a way to modify all the commit usernames and emails to an other one in a repository keeping the date of the commit and every other information about the commits?
06:14 akushner joined #git
06:14 lindenle joined #git
06:15 jaafar joined #git
06:15 grawity no
06:15 grawity at minimum, you'll lose commit IDs
06:16 grawity `git filter-branch --env-filter` can do the rest though
06:17 gabord grawity: Oh, ok. commit id's are not important.
06:17 akushner joined #git
06:18 gabord grawity: Ok, i will look into filter-branch, thanks.
06:18 grawity ah yes, there's also reposurgeon
06:18 thiago gabord: are you the only developer in this repository?
06:18 gabord thiago: Yes
06:18 gabord thiago: Its only my linux config files.
06:18 thiago gabord: ok, if you have more than one clone of this repository, you'll have to delete and re-clone
06:18 thiago ok
06:19 gabord grawity: I can see you are in #gentoo too. The repo im talking about is the gentoo config files.
06:21 grawity I don't know what config files you're talking about
06:21 grawity and it doesn't matter much, anyway
06:21 kisonecat joined #git
06:22 gabord grawity: Some config files in the /etc folder for the system. And it doesnt matter, just mentioning.
06:22 lamppid joined #git
06:23 yqt joined #git
06:23 baba_ joined #git
06:23 nnyk joined #git
06:24 thinsoldier joined #git
06:24 MutantMahesh joined #git
06:24 eletuchy joined #git
06:28 nnyk_ joined #git
06:33 thinsoldier joined #git
06:34 pcarrier left #git
06:35 zeroed joined #git
06:35 zeroed joined #git
06:35 ochorocho__ joined #git
06:37 bronson joined #git
06:40 malide joined #git
06:41 stantonk joined #git
06:41 apotry joined #git
06:45 neanderslob joined #git
06:48 mwhooker joined #git
06:48 AciD` thiago, ojacobson -> sorry, something came up, I'm back :x A is the oldest commit, C is the youngest
06:49 smokeysea left #git
06:52 andyhoang joined #git
06:52 baba_ joined #git
06:52 qt-x joined #git
06:56 fuchstronaut joined #git
06:58 qt-x joined #git
06:58 thiago AciD`: that was six hours ago
06:58 thiago AciD`: sorry. I'm going to bed now.
06:58 AciD` no pb :)
06:58 AciD` good night
07:00 Olipro_ joined #git
07:01 thinsoldier joined #git
07:04 MutantMahesh joined #git
07:09 citizen-stig joined #git
07:10 xbob joined #git
07:10 zeroed joined #git
07:10 zeroed joined #git
07:11 pantsman- joined #git
07:11 emPi joined #git
07:17 aizex joined #git
07:19 Achylles joined #git
07:22 The_Phoenix joined #git
07:25 narendraj9 joined #git
07:25 elastix joined #git
07:25 nnyk_ joined #git
07:26 eletuchy joined #git
07:29 josuebrunel joined #git
07:30 acetakwas joined #git
07:31 pmort_ joined #git
07:32 a_thakur joined #git
07:34 a_thakur joined #git
07:37 unforgiven512 joined #git
07:37 baba_ joined #git
07:37 unforgiven512 joined #git
07:37 andyhoang-work joined #git
07:38 eme joined #git
07:38 a_thakur_ joined #git
07:40 HerrThees joined #git
07:42 Junior joined #git
07:48 schpn joined #git
07:49 ferr joined #git
07:53 haway joined #git
07:53 hgl joined #git
07:53 hgl left #git
07:57 fuchstronaut joined #git
07:59 eletuchy joined #git
08:02 Sendoushi joined #git
08:03 lpapp joined #git
08:04 lpapp left #git
08:05 lpapp joined #git
08:05 lpapp hey, I have just used git rebase -i 5da5e090a243c9b5df77a6003dfa85a4ea5f6c8f --root
08:05 lpapp but even after change, git commit --amend, git rebase --continue, my second commit disappeared.
08:05 lpapp I had two commits in my repository and I wanted to change the first before pushing.
08:05 lpapp how can I gain my second commit back?
08:05 lpapp it had a lot of work
08:06 lpapp probably one week
08:07 ximvan joined #git
08:07 lpapp I am going real nuts if that much work is lost!!
08:07 spykins joined #git
08:08 ximvan joined #git
08:09 ximvan joined #git
08:10 ximvan joined #git
08:11 ximvan joined #git
08:12 waterCreature joined #git
08:13 ximvan joined #git
08:13 wicope joined #git
08:14 ximvan joined #git
08:15 Neon1024 joined #git
08:15 _pix joined #git
08:15 thekingofbandit joined #git
08:16 lindenle joined #git
08:17 thekingofbandit left #git
08:17 waterCreature Hi, is it possible to use git as offline? Like I create a git repo on my laptop and do all the push and pull, to keep a backup of the different states instead of pushing it to  a remote repo online?
08:17 lpapp what would be the commended way for that?
08:17 dreiss joined #git
08:17 waterCreature yes, That's what I would like to knowo also, is there a specific approach I could follow?
08:18 marcogmonteiro joined #git
08:18 lpapp waterCreature: I am referring to my question, actually.
08:18 MutantMahesh joined #git
08:18 thekingofbandit joined #git
08:18 a3Dman joined #git
08:21 sanketdg joined #git
08:21 waterCreature Ipapp I have not seen your question, but your phrasing is better than how I am trying to describe my question. Sorry for the confusion.
08:21 waterCreature lpapp ^
08:21 dreiss joined #git
08:21 waterCreature my connection is quite bad also.
08:22 lpapp :D
08:25 dreiss joined #git
08:26 Jellyg00se joined #git
08:28 Shashikant86 joined #git
08:29 jonmorehouse joined #git
08:31 fscala joined #git
08:31 pmort_ joined #git
08:32 kurkale6ka joined #git
08:32 TomyLobo joined #git
08:35 sans_s3r1f joined #git
08:36 ochorocho__ joined #git
08:36 rafalcpp joined #git
08:37 pmort__ joined #git
08:40 bronson joined #git
08:40 pmort_ joined #git
08:41 garethdaine joined #git
08:41 _0xAX joined #git
08:47 Neon1024x joined #git
08:48 texinwien_ joined #git
08:49 ahmedelgabri joined #git
08:49 mischat joined #git
08:50 sq-one joined #git
08:51 prsn joined #git
08:53 andyhoang joined #git
08:54 citizen-stig joined #git
08:54 sergio1234 joined #git
08:57 bernardio joined #git
08:57 fuchstronaut joined #git
08:58 leeN joined #git
08:58 mase-tech joined #git
08:59 mischat joined #git
09:00 MutantMa_ joined #git
09:01 aizex joined #git
09:02 pmort_ joined #git
09:03 a_thakur joined #git
09:04 elsevero joined #git
09:04 pmort_ joined #git
09:04 zeroed joined #git
09:07 nighttime joined #git
09:08 bernardio joined #git
09:09 pmort_ joined #git
09:11 bket joined #git
09:13 Walex waterCreature: what you want to do may not make a lot of sense to me, but you can have a local "bare" repo and clone it locally so it is the "remote" of the cloned repo. There is no requirement that the "remote" repo be actually on a different host.
09:13 SteffanW joined #git
09:17 LeBlaaanc joined #git
09:18 subhojit777 joined #git
09:20 citizen-stig joined #git
09:21 eletuchy joined #git
09:22 satifant joined #git
09:23 aidalgol joined #git
09:25 SteffanW joined #git
09:26 aizex joined #git
09:29 DonRichie joined #git
09:30 Balliad joined #git
09:30 DonRichie joined #git
09:31 jaguarmagenta joined #git
09:31 aizex joined #git
09:31 DonRichie joined #git
09:33 ochorocho__ joined #git
09:37 lamppid joined #git
09:37 Sendoushi joined #git
09:37 gaen joined #git
09:38 _ikke_ You can even push into the current repository if you set it up correctly
09:39 notebox joined #git
09:42 mdw joined #git
09:42 lpapp so does anyone know how I can rebase my first commit if I have two locally in a brand new repository?
09:43 nilg joined #git
09:43 variable joined #git
09:43 garethdaine joined #git
09:43 _ikke_ lpapp: git rebase --root in a not too old version of git
09:44 lpapp yes, that is what I tried which did not work, sadly.
09:44 TomyLobo upgrade git and try again
09:44 DonRichie joined #git
09:45 TomyLobo it's possible to do it otherwise, but upgrading git is easier
09:45 TomyLobo and has other benefits
09:45 lpapp git --version
09:45 lpapp git version 2.8.2
09:45 prsn joined #git
09:45 TomyLobo oh it's "git rebase -i --root" of course
09:46 TomyLobo git rebase --root on its own wouldnt make a ton of sense
09:46 lpapp yes, that is what I tried really.
09:46 TomyLobo what happened when you tried?
09:47 lpapp havoc :)
09:47 lpapp the second commit got entirely lost
09:48 TomyLobo was it empty?
09:48 lpapp no
09:48 lpapp could be because I used the exact hash
09:48 lpapp not HEAD~1
09:48 TomyLobo do you still have the repo before the rebase?
09:49 TomyLobo wait what hash
09:49 lpapp git checkout master solved it
09:49 TomyLobo where
09:49 lpapp sha1
09:49 TomyLobo where did you use a hash?
09:49 lpapp git rebase -i <here> --root
09:49 TomyLobo no, the --root is the "here"
09:49 endiruna joined #git
09:49 TomyLobo that explains your problems :)
09:50 FuzzySockets joined #git
09:50 TomyLobo simply run "git rebase -i --root"
09:51 TomyLobo if you take a look at the manpage, there are two syntaxes:
09:51 Shentino joined #git
09:52 TomyLobo git rebase [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] [<upstream> [<branch>]]
09:52 TomyLobo git rebase [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
09:52 TomyLobo you told it to rebase the detached head "<sha hash>" up to and including the repository root
09:53 TomyLobo which explains why you ended up in detached head mode
09:53 digidog joined #git
09:53 lpapp ok, thanks.
09:53 TomyLobo !detached
09:53 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
09:54 inflames joined #git
09:54 aizex joined #git
09:55 spykins Hello everyone, I initialize a git project on my laptop and I want to set a remote url… Spykins:VanoNews Spykins$ git remote set-url origin https://github.com/andela-wakinsanmi/VanoNews.git
09:55 lpapp left #git
09:55 TomyLobo spykins, you cannot set-url on a non-existant remote
09:55 spykins It keeps saying no remote
09:55 TomyLobo use add
09:55 spykins ok thanks
09:55 TomyLobo spykins, question
09:55 TomyLobo why not just clone?
09:56 spykins I have the initial setup and file structure on my system
09:56 TomyLobo ah
09:56 spykins it’s an android studio project
09:56 TomyLobo and you want to commit that over the readme&thing you already have in your repo
09:56 spykins exactly..
09:56 TomyLobo git fetch origin && git reset --hard origin/master
09:57 TomyLobo assuming there are no files in common
09:57 spykins I think local git init initializes a readme too
09:57 TomyLobo nope
09:57 EY joined #git
09:57 TomyLobo that would be really strange if it did
09:58 spykins I should try git fetch origin?
09:58 TomyLobo git fetch origin on its own is harmless
09:58 fuchstronaut joined #git
09:58 TomyLobo and instead of "git reset --hard origin/master", you could do "git reset origin/master && git checkout -p"
09:59 prsn joined #git
09:59 TomyLobo the last part of that will prompt you for each individual change and will place it in your working copy if you say "y"
09:59 spykins TomyLobo:  too many commands
09:59 spykins Don’t know which one to type
09:59 TomyLobo git fetch origin && git reset origin/master && git checkout -p
10:00 spykins og
10:00 texinwien_ joined #git
10:00 TomyLobo fetch remote changes, make local master branch equal to remote master branch, grab changes from github one change at a time
10:01 spykins git fetch origin returns a fatal erro
10:01 TomyLobo git remote add origin https://github.com/andela-wakinsanmi/VanoNews.git && git fetch origin && git reset origin/master && git checkout -p
10:01 TomyLobo i thought you had added the remote in the meantime :D
10:02 spykins nope… lol.. I asked you if i could fetch without adding the remote url
10:02 TomyLobo btw, are you copying the individual commands?
10:02 TomyLobo there's no need to, the shell will evaluate the && for you
10:02 TomyLobo and it will only move on to the next command if it's successful
10:03 TomyLobo no you didnt ask that
10:03 TomyLobo at least not me :)
10:03 spykins lol
10:05 spykins git reset origin/master
10:05 spykins what will this do please?
10:06 spykins and git checkout -p?
10:06 TomyLobo git remote add origin https://github.com/andela-wakinsanmi/VanoNews.git && git fetch origin && git reset origin/master && git checkout -p
10:06 bongjovi joined #git
10:06 TomyLobo make github remote known to git, fetch remote changes, make local master branch equal to remote master branch, grab changes from github one change at a time
10:07 spykins nice
10:07 TomyLobo git reset without --hard will only change your current branch and the index
10:07 TomyLobo but not the working copy
10:07 dsdeiz joined #git
10:07 spykins ok
10:08 Felishia joined #git
10:08 Felishia my gitignore file is ignored
10:08 ams_ joined #git
10:08 TomyLobo "git checkout -p" will apply changes to your working copy
10:09 TomyLobo Felishia, can you be more specific?
10:09 Felishia I tell it to ignore index.html but it still adds it
10:09 TomyLobo Felishia, .gitignore?
10:09 Felishia yes
10:09 TomyLobo is index.html already tracked?
10:10 TomyLobo i.e. has it been part of the last commit?
10:10 Felishia in fact when it had written index.html it will ignore ANYTHING containing the string index.html
10:10 Felishia well I think so
10:10 TomyLobo there you have it
10:10 Felishia somehow it managed to commit itself
10:10 TomyLobo .gitignore only prevents adding new files that match
10:10 Felishia how do I uncommit it
10:11 TomyLobo first of all are there any changes currently on the index?
10:11 spykins TomyLobo:  after typing “git reset origin/master ” git status shows that .gitignore modified, LICENSE and Readme.md deleted
10:11 TomyLobo spykins, correct
10:12 TomyLobo spykins, that's cause your current branch now contains them, since you moved it to the branch github created
10:12 spykins I bet the command git reset origin/master is replacing those files with what I have on github
10:12 livingstn joined #git
10:12 TomyLobo it does the opposite
10:12 TomyLobo it does everything but replace files in your working copy
10:13 TomyLobo spykins, "git checkout -p" will prompt you with every change that is not yet in your working copy
10:13 TomyLobo run it, you'll see
10:14 spykins it shows some files and ask Discard this hunk from worktree?
10:14 TomyLobo yes
10:15 TomyLobo well it assumes you cloned the github repo and then replaced it by what's there atm
10:15 spykins is this an alternative to merging?
10:15 TomyLobo so you're discarding the removal of the LICENSE and readme etc
10:15 spykins I guess I have to say Yes… but it’s picking up files like .DS_STORE
10:15 eletuchy joined #git
10:16 TomyLobo spykins, not really. but it's a useful tool for getting specific changes from some place
10:16 TomyLobo spykins, that's not a file you see there
10:16 TomyLobo that's the content of the .gitignore file
10:16 spykins oh….. yes cool…..
10:16 TomyLobo i guess android studio made one for you
10:16 TomyLobo better use that
10:16 spykins Those files …
10:17 TomyLobo and commit it over the github .gitignore
10:17 spykins I think, Github actually
10:17 TomyLobo i.e. answer "no" to the "discard this hunk" for the .gitignore
10:17 aidalgol joined #git
10:17 TomyLobo spykins, i'm gonna ignore those fragments until you form a complete sentence btw
10:18 spykins I initialized the GitIgnore on github based on Android projects and Github adds those files for me
10:19 spykins Now, I am going to type no
10:19 TomyLobo <spykins> I initialized the GitIgnore on github based on Android projects and Github adds those files for me
10:19 TomyLobo yes, and something on your machine also created a .gitignore for you
10:19 TomyLobo i'm guessing it was android studio
10:19 TomyLobo so you decide which one you want
10:19 TomyLobo android studio - n
10:19 TomyLobo github - y
10:19 spykins nope.. git init
10:20 TomyLobo git init doesnt create files!
10:20 spykins git init created .gitignore file right?
10:20 TomyLobo no
10:20 TomyLobo git init only creates your local git repository in .git
10:20 skylite joined #git
10:20 TomyLobo nothing else
10:20 spykins oh ok
10:20 spykins do i say no
10:20 spykins ???
10:21 spykins Discard this hunk from worktree?
10:21 TomyLobo so you decide which one you want
10:21 TomyLobo android studio - n
10:21 TomyLobo github - y
10:21 spykins github
10:22 TomyLobo i would say android studio knows itself better than github, but your choice
10:22 spykins ok
10:22 spykins can’t i merge the file together??
10:23 TomyLobo you probably could, but i'm not going to guide you through that
10:23 spykins will probably have conflict
10:23 spykins TomyLobo: ok… I will go for n then
10:24 spykins normally.. what I do is add the remote url… git pull .. which fetches and merge the local master and remote branc
10:24 spykins Then, I will have a conflict, then resolve it locally…
10:24 spykins fastforward and push it to origin master branch
10:25 spykins If I can avoid the merge conflict using this method… I have learnt something today and I will really appreciate you TomyLobo
10:25 spykins TomyLobo: SO now, I want to type n
10:27 spykins TomyLobo:  now the copyright, Do i say n to that too?
10:28 fahadash joined #git
10:31 eka joined #git
10:33 Mandevil joined #git
10:34 Mandevil Hello! I have stash apply conflict I can't get rid of. When I manual edit the file in question and then git add and git commit I get "nothing added to commit" and I'm back where I started.
10:34 Mandevil What am I doing wrong?
10:36 selckin need to say exactly waht you do
10:36 larsrustand joined #git
10:37 Mandevil git stash apply says I have a conflict in one file.
10:37 Mandevil So I edit the file to resolve the conflict.
10:37 Mandevil Then I do git add <file>, then git commit -m 'Resolve'... and get "nothing added to commit"
10:37 Mandevil And the merge is not done.
10:38 subhojit777 joined #git
10:38 selckin then you edit it to whats already in the repo
10:38 selckin and you can't merge a stash
10:39 Mandevil I do edit to what's in the repo.
10:40 Mandevil And the stash has quite some work in it.
10:40 Mandevil So I definitely want to save it.
10:41 selckin need a log not making much sense
10:41 Mandevil ok.
10:43 stantonk joined #git
10:43 Mandevil http://pastie.org/10839204
10:44 selckin status after add
10:44 selckin or before
10:45 selckin you have to be editting it to back to original
10:45 Mandevil I am editing it back to upstream, yes.
10:45 Mandevil Is that wrong?
10:46 selckin why do you expect there to be somethign to commit
10:46 Mandevil I want to apply the stash.
10:46 selckin thats the only change in the stash
10:46 selckin or include that part in the log
10:46 Mandevil Yes, that part of stash is in conflict, because I did the work in another branch and then merged it.
10:47 selckin if it conflicts it won't remove the entry from the stash, maybe this is problem
10:47 selckin git stash list
10:47 EY___ joined #git
10:47 selckin git stash drop
10:47 Mandevil Won't git stash drop lose work?
10:47 selckin it'll drop this stash entry you're trying to apply that does not change antyhign you want to keep?
10:48 Mandevil Now I don't understand.
10:48 diegoaguilar joined #git
10:48 selckin why do you want to apply this stash entry when it doesn't have any changes you want to keep
10:49 Mandevil It does!
10:49 Mandevil There's only one conflict there aside from lot of work that does not conflict.
10:49 nchambers joined #git
10:49 Mandevil I want to get rid of the conflicting part of the stash, but apply the rest.
10:49 selckin how are you resolving the conflict now?
10:50 Mandevil Can I actually view the content of unapplied stash?
10:50 selckin yes, git stash show -p
10:50 gechr joined #git
10:51 Mandevil Hm, I don't even see the conflicting part in the git stash show -p.
10:51 selckin it diffs with the original not the current
10:52 selckin after you apply it you can do git diff --cached to see the conflict & other changes
10:53 Mandevil spam@l5nets02:~/dev$ git diff --cached
10:53 Mandevil * Unmerged path spam.pl
10:54 andyhoang joined #git
10:55 Raging_Hog joined #git
10:56 selckin without cached then
10:56 Mandevil Eh, I did git reset.
10:57 Mandevil http://pastie.org/10839219
10:58 Mandevil The 'stashed changes' part is what I want to get rid off.
10:58 Mandevil Since upstream has newer version.
10:59 fuchstronaut joined #git
11:09 citizen-stig joined #git
11:09 Mandevil BTW, what does this mean: http://pastie.org/10839231
11:10 Mandevil This is git diff after applying stash and editing the conflicted file.
11:11 citizen-_ joined #git
11:15 Mandevil I think I got it now.
11:15 Mandevil No, I did not.
11:17 Mandevil Yes I did :)
11:18 Mandevil And I understand what I even did.
11:18 lindenle joined #git
11:19 deadnull_ joined #git
11:19 DonRichie joined #git
11:20 APic joined #git
11:20 APic Hi
11:20 gitinfo APic: 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.
11:21 nagchampa joined #git
11:21 bakanon joined #git
11:21 toogley joined #git
11:22 robotroll joined #git
11:23 DonRichie joined #git
11:25 wicope left #git
11:25 JanC_ joined #git
11:26 cxz joined #git
11:26 johnmilton joined #git
11:31 anu1 joined #git
11:32 PCatinean joined #git
11:36 crameth joined #git
11:37 harish joined #git
11:39 nagchampa I was wondering what the "Use a TrueType font in all console windows" actually changes on the system in the git for windows installer?
11:41 rnsanchez joined #git
11:41 a_thakur joined #git
11:43 govg joined #git
11:43 TomyLobo which git for windows are we talking about?
11:44 c0ded joined #git
11:44 TomyLobo most have their own console (msysgit has mintty), so it probably doesnt affect cmd if that's your question
11:46 frobnic joined #git
11:46 m_antis joined #git
11:47 c0ded joined #git
11:48 johnmilton joined #git
11:48 ril joined #git
11:49 johnny56 joined #git
11:49 ril joined #git
11:50 dimi1947 joined #git
11:51 c0ded joined #git
11:52 sdothum joined #git
11:54 |2701 joined #git
11:54 Chill_Surf joined #git
11:56 raven-au joined #git
11:57 rgrinberg joined #git
11:58 c0ded joined #git
11:59 mizu_no_oto joined #git
12:00 fuchstronaut joined #git
12:00 prsn joined #git
12:00 fstd joined #git
12:01 sinkensabe joined #git
12:02 ochorocho__ joined #git
12:03 raven-au joined #git
12:03 eletuchy joined #git
12:04 RichiH there was a change in how gitignore works in "recent" times
12:04 * RichiH can't find that change info any more...
12:04 Phreya joined #git
12:05 wviana joined #git
12:06 aizex joined #git
12:11 nagchampa TomyLobo: yeah thanks, i just left it unchecked as the windows console is already using a truetype font anyway
12:11 nagchampa seems to have left everything alone
12:11 nagchampa it sort of seemed like an odd place to put an option like that
12:12 Dyonisos joined #git
12:12 italoacasas joined #git
12:13 wviana joined #git
12:15 synthroid joined #git
12:16 gnoel joined #git
12:17 Balliad joined #git
12:17 rgrinberg joined #git
12:18 rwb joined #git
12:19 Maxis joined #git
12:19 hampus joined #git
12:21 Rish joined #git
12:21 c0ded joined #git
12:21 ronskisika joined #git
12:22 cyan__ joined #git
12:24 c0ded joined #git
12:24 exarch joined #git
12:24 hampus left #git
12:25 khmarbaise joined #git
12:26 Sendoushi joined #git
12:30 spykins_ joined #git
12:32 st0opkid joined #git
12:34 c0ded joined #git
12:35 notebox joined #git
12:36 Fijit joined #git
12:36 fhmgufs joined #git
12:36 fhmgufs Is there an easy way to correct one old commit message (not the most recent)?
12:36 Rish_ joined #git
12:36 naitsirhc joined #git
12:37 mdw joined #git
12:38 narendraj9 joined #git
12:39 tach joined #git
12:40 perlpilot fhmgufs: Define "easy".   Yes, there's an easy way if you don't mind certain things.
12:41 perlpilot fhmgufs: For instance, you use interactive rebase to change the old message, but it'll affect every commit from that one to the most recent
12:41 fhmgufs Go
12:42 fhmgufs Well, that's ok, but is there no way to just affect one commit.
12:42 fhmgufs ?
12:42 Levitator I don't know how perl people deal with so many regexes. I just dabbled in sed for a makefile project, and I reached the conclusion that it eventually leads to insanity.
12:42 perlpilot no,  if you change the one commit, it will affect every commit afterwards.
12:43 durham joined #git
12:43 perlpilot Levitator: There's a fine line between insanity and genius. We perl people try to walk that line as best we can; sometimes falling on one side or the other  :-)
12:43 bronson joined #git
12:44 Levitator It was pretty rewarding, though. I now have a self-modifying self-extracting makefile which is its own source archive.
12:44 c0ded joined #git
12:44 Levitator It's an abomination that feels me feel dirty inside, and I'm beginning to like it.
12:45 Levitator *make me feel dirty
12:45 umdstu joined #git
12:46 Levitator I had to come up with a regex transformation that escapes an arbitrary text file so as to reconstitute the original file when it is fed through both a shell and "echo, twice.
12:47 bitkiller joined #git
12:48 Levitator Oh, yes, and then the text as well as the script that processes it has to be escaped so as to fit in a makefile variable declaration.
12:48 * variable does a jig
12:49 nagchampa left #git
12:49 sto0pkid joined #git
12:49 Levitator So, basically, it's a long line of random-looking text which looks like someone randomly pounded on the quote and slash keys.
12:50 fhmgufs perlpilot: So, how do I use this interactive rebase thing? It seems to be very weird.
12:50 liquidjamm joined #git
12:50 variable fhmgufs: you edit the text file with the directions you want it to follow
12:51 c0ded joined #git
12:51 xlegoman joined #git
12:51 Somelauw joined #git
12:51 |2701 joined #git
12:51 |2701 joined #git
12:51 fhmgufs variable: So, what would I enter there, if I want to change the commit message of an old commit?
12:52 Somelauw I have a cloned a repo twice, so I have ~/a and ~/b. I have committed changes to ~/b. Can I now push these commits to ~/a?
12:52 zalatovo joined #git
12:52 durham joined #git
12:52 variable fhmgufs: "edit"
12:52 variable fhmgufs: the comments are telling (at the bottom)
12:53 fhmgufs Ah, thanks.
12:53 durham joined #git
12:54 cdesai joined #git
12:54 andyhoang joined #git
12:55 sinkensabe joined #git
12:55 kus joined #git
12:56 thinsoldier joined #git
12:57 fhmgufs variable, perlpilot: Sorry, I still don't get it: What exactly do I do for e.g. changing the commit message of the second last commit?
12:57 monoprotic joined #git
12:57 monoprotic joined #git
12:57 variable fhmgufs: git rebase -i HEAD^^^
12:58 variable then change "pick" to "edit" (change the content) or "reword" (just the message)
12:59 ronskisika joined #git
12:59 fhmgufs variable: Yeah, thanks a lot, now it worked!
13:00 kutsuya joined #git
13:00 angelsl joined #git
13:01 mbrzuzy joined #git
13:01 Somelauw nvm, i solved problem by just removing ~/a
13:02 m0viefreak joined #git
13:02 MarkyC joined #git
13:04 variable Somelauw: for future reference git push file:///.../a/ should work
13:05 sinkensabe joined #git
13:05 MyBot joined #git
13:06 LeMike joined #git
13:09 ekinmur joined #git
13:09 a_l_e joined #git
13:09 Somelauw thanks variable
13:09 TomyLobo Levitator, you could do what everybody else does and just make a self-extractor :)
13:10 TomyLobo a zip file with some stuff tacked in front
13:10 TomyLobo lemme try if it's really that simple...
13:10 variable TomyLobo: I prefer using a different tool for remote distribution
13:11 variable or more specifically remote machine distribution
13:11 variable solves all known problems: 'rm' for short
13:11 sinkensabe joined #git
13:13 * grawity unsets variable
13:13 apotry joined #git
13:13 * variable explodes on grawity
13:13 asnoehu joined #git
13:14 TomyLobo Levitator, yes it really is that simple
13:15 rnsanchez_ joined #git
13:15 jimi_ joined #git
13:16 vrandkode joined #git
13:16 AK-47 joined #git
13:17 sinkensabe joined #git
13:17 AK-47 hey guys
13:17 gitinfo AK-47: 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.
13:17 AK-47 :)
13:18 espindola joined #git
13:18 AK-47 come to ##securify for private repo of su software and hardware
13:18 AK-47 there is proxy on it
13:19 cdg joined #git
13:19 Gsham joined #git
13:19 AK-47 was kicked by qsx: AK-47
13:20 todd_dsm joined #git
13:21 CEnnis91 joined #git
13:21 Akuli joined #git
13:21 * ilmari wishes 'git merge --ff-only --no-ff' worked
13:22 ilmari i.e. only merge if it _could_ have been a fast-forward, but don't _actually_ fast-forward
13:22 Levitator TomyLobo: I want it to be compatible with text mediums such as pastebins, though.
13:22 Noldorin joined #git
13:22 Akuli I started using git with github today, and it's working fine so far
13:23 c0ded joined #git
13:23 Akuli I have done this, but which commands do i need to simply download the master branch, then after doing some changes upload it again, making the repository an exact clone of what i have on my computer?
13:23 Akuli I'm not quite sure if i'm doing this right.
13:24 S1C joined #git
13:25 TomyLobo Levitator, https://gist.github.com/TomyLobo/9198ad877bf9c1f853306f5309593de0
13:25 TomyLobo Levitator, oh
13:25 Walex Akuli: that's in any intorduction, look for "pull" and "push"
13:25 bollullera joined #git
13:26 TomyLobo Levitator, put it on github instead :P
13:26 khmarbaise joined #git
13:26 Akuli Walex, i've used them, but just pulling and pushing doesn't seem to be enough
13:26 Levitator Yeah, but then it's reliant on the continued existence of github.
13:26 ronny_ joined #git
13:27 Levitator This is self-contained and will last as long as GNU.
13:27 Akuli i've used all kinds of extra crap, like git add and git commit... and even then it doesn't remove the files i've removed on my computer and i need git rm for that
13:27 Akuli i just want to upload the whole thing at once with as little commands as possible
13:28 tlaxkit joined #git
13:30 jaafar joined #git
13:30 liamonade joined #git
13:32 jaguarmagenta joined #git
13:32 c0ded joined #git
13:33 bollullera left #git
13:33 khmarbaise joined #git
13:34 Felishia help
13:34 Akuli Walex, can i just 'git add *' to add everything, does that include subdirectories?
13:35 gtqgup joined #git
13:35 jstimm joined #git
13:36 bollullera joined #git
13:37 docnvk joined #git
13:37 Akuli or maybe i don't need that :)
13:38 d0nn1e joined #git
13:38 APic lol
13:38 thinsoldier joined #git
13:38 unbalancedparen joined #git
13:38 Asiajey joined #git
13:38 Asiajey joined #git
13:38 ilmari Akuli: 'git add .' adds everything not ignored, including subdirectories
13:40 Akuli Oh right, of course :)
13:40 c0ded joined #git
13:40 Akuli But i think the right way would be not to add files that i haven't modified, so i guess i don't need that. But how about removing files?
13:40 garethdaine joined #git
13:40 Akuli git rm file?
13:41 Akuli whatever, i can google that
13:42 ilmari git add picks up removed files too, in recent versions
13:42 ilmari man git add
13:42 ilmari !man git add
13:42 ilmari !man git-add
13:42 gitinfo the git-add manpage is available at http://jk.gs/git-add.html
13:42 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
13:42 gitinfo the git-add manpage is available at http://jk.gs/git-add.html
13:42 gitinfo the git-add manpage is available at http://jk.gs/git-add.html
13:43 ilmari ops
13:43 ilmari oops
13:43 Dougie187 joined #git
13:43 hrsxpj joined #git
13:45 kgirthofer joined #git
13:45 kgirthofer what's the best way to migrate a ton of svn projects to git?
13:45 kgirthofer I realize I can google it, but I'm looking for direct feedback and people who've done it in their environments
13:46 qsx the !best way would be !svn2git
13:46 gitinfo [!bestway] You want to know the best way to do X? If you can give us a proper definition of "best", we'll give you a proper way to do X ;)
13:46 gitinfo For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://github.com/svn-all-fast-export/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763
13:46 qsx it’ll require _some_ handwork, but either that or you get an ugly result
13:46 themill svn-all-fast-export can sometimes work but can also get badly confused by newer svn features
13:46 qsx themill: what kind of new features?
13:47 a3Dman joined #git
13:47 themill 2 years ago, I would have definitely said svn-all-fast-export but I've not been able to get it to work since svn 1.9
13:47 citizen-stig joined #git
13:47 kgirthofer awesome. Thanks for the quick and civil responses! Appreciated. I'll look into the above tools
13:47 AaronMT joined #git
13:48 andyhoang joined #git
13:48 themill qsx: tagging is a copying action in svn and, from what I can see, if you didn't svn up prior to svn cp, you create some sort of weirdo mixed revision tag. retagging is even worse at doing that
13:49 wicope joined #git
13:49 themill it all depends on how careful you were throughout your entire history
13:49 qsx alas, most people aren’t careful with VCS
13:49 tjbp_ left #git
13:49 * qsx looks at themself and coughs loudly
13:49 themill kgirthofer: I've got a few projects where throwing the history away and importing only the unpacked release tarballs was the way to go because it wasn't worth the pain of importing
13:50 qsx (at least i can fix it with git. rebase --interactive to the rescue \o/ )
13:50 themill qsx: I've reworked histories imported from svn with grafts to make them sane...
13:50 wicope Hi. Create a new Git repo. How Push my history into this new repo? Thanks
13:50 kgirthofer themill, that's what I'll be doing for about 10
13:51 Akuli left #git
13:51 kgirthofer but I have like 200 that haven't been touched
13:51 kgirthofer I really would rather just put them in s3 and be done
13:51 qsx wicope: git push
13:51 spykins_ left #git
13:51 tjbp_ joined #git
13:52 eletuchy joined #git
13:53 |ifei5good joined #git
13:53 qtax^w joined #git
13:54 frewtc4ke left #git
13:55 ash_workz joined #git
13:56 qt-x joined #git
13:58 Shentino joined #git
13:59 durham joined #git
14:00 rkazak joined #git
14:01 phaleth joined #git
14:01 fuchstronaut joined #git
14:03 MarkyC joined #git
14:04 realz_ joined #git
14:07 xreal_alt joined #git
14:09 citizen-_ joined #git
14:09 mdw joined #git
14:11 lindenle joined #git
14:12 SteffanW joined #git
14:12 mdw_ joined #git
14:13 nilsi_ joined #git
14:13 cracking joined #git
14:14 T4nk5bb0t joined #git
14:14 T4nk5bb0t I am having a bitbucket git issue.
14:14 T4nk5bb0t This might take a moment to type out
14:14 liamonade joined #git
14:14 al-damiri joined #git
14:15 b100s joined #git
14:15 Phegc joined #git
14:15 b100s hi2all
14:15 b100s how can i unstage file but not remove changes from it?
14:15 kevwil joined #git
14:15 T4nk5bb0t I had a branch, it was going well. There were some changes recommended by a co-worker. He submitted them on a second branch. Both branches, 1 and 2, had a pull request. 1 merged to master, 2 merged to 1. I liked what I saw in branch 2, so I merged it into branch 1. It only merged into the pull request, it did not merge into the branch itself. What happened?
14:16 b100s accidentally did 'git add path'
14:16 T4nk5bb0t I think git reset <file>
14:16 T4nk5bb0t b100s,
14:16 b100s will it keep changes, T4nk5bb0t ?
14:17 T4nk5bb0t b100s, I think you want to git reset <file> and that will reset to to the previous index but not change anything. Here I found this post on SO, http://stackoverflow.com/questions/348170/undo-git-add-before-commit
14:17 EY___ joined #git
14:18 prsn joined #git
14:18 satifant b100s, without --hard, git reset doesn't change the working-tree
14:18 b100s thanks a lot, T4nk5bb0t , satifant
14:18 axelitus joined #git
14:19 T4nk5bb0t satifant, --hard will undo changes too?
14:19 leonarth joined #git
14:19 satifant yes
14:19 T4nk5bb0t cool
14:19 T4nk5bb0t Does anyone have an idea with my problem?
14:20 ash_workz anyone know anything about Meld? I have a file in a dir but it doesn't show up during comparison with another dir for some reason (I know that's not really a git question but I don't know where else to ask :\ )
14:22 axelitus joined #git
14:22 T4nk5bb0t ash_workz, Sorry brotato chip
14:22 T4nk5bb0t ash_workz, I don't know
14:22 andyhoang1 joined #git
14:25 T4nk5bb0t Why would I have changes in a pull request that don't exist in the branch?
14:26 wbzqx3 joined #git
14:26 dstarh joined #git
14:28 fahadash joined #git
14:28 NeverDie joined #git
14:28 satifant T4nk5bb0t, maybe #bitbucket is the better place to ask your question?
14:28 eka joined #git
14:29 T4nk5bb0t satifant, thanks
14:30 Gamecubic joined #git
14:30 noteness joined #git
14:31 crose joined #git
14:31 relipse2 joined #git
14:32 Gsham joined #git
14:32 xlegoman joined #git
14:32 aizex joined #git
14:33 yqt joined #git
14:34 jimmybuffet joined #git
14:36 cracking joined #git
14:37 eka joined #git
14:38 lindenle joined #git
14:39 clemf joined #git
14:40 efco joined #git
14:41 njbair joined #git
14:42 eka_ joined #git
14:43 kinokoio joined #git
14:44 tinanoo joined #git
14:44 wviana joined #git
14:44 mdw joined #git
14:45 mdw joined #git
14:46 bronson joined #git
14:46 Pulp joined #git
14:48 realz joined #git
14:49 eka joined #git
14:51 m0nkmaster joined #git
14:52 frem_ joined #git
14:56 aizex joined #git
14:57 quenode joined #git
14:58 baba_ joined #git
15:00 The_Phoenix joined #git
15:01 The_Phoenix joined #git
15:01 kilo_bravo joined #git
15:02 The_Phoenix joined #git
15:03 The_Phoenix joined #git
15:04 s00pcan joined #git
15:04 johnwhitton joined #git
15:04 xbob joined #git
15:05 The_Phoenix joined #git
15:05 hobodave joined #git
15:05 The_Phoenix joined #git
15:06 stantonk joined #git
15:07 bitkiller joined #git
15:07 mischat_ joined #git
15:08 crose joined #git
15:08 nishbanoo joined #git
15:09 MadHatter42 joined #git
15:09 nishbanoo I'm working on a repo that has been chaned since I have forked it; If I follow this instrucrtion: http://stackoverflow.com/a/7244456 what will happen for my works? Woulb be there kinda of conflict
15:09 nishbanoo ?
15:10 nishbanoo changed*
15:11 Gitzilla joined #git
15:11 bango2 joined #git
15:12 NeverDie joined #git
15:12 satifant joined #git
15:15 stantonk joined #git
15:16 astrofog joined #git
15:16 King_Hual joined #git
15:16 King_Hual joined #git
15:17 wcpan joined #git
15:17 rahtgaz joined #git
15:18 Stevko joined #git
15:19 jwitko joined #git
15:19 zivester joined #git
15:21 c0ded joined #git
15:22 mischat joined #git
15:23 thiago joined #git
15:23 jwitko Hi All, using version 2.8.2 on ubuntu 14.04 I am having an issue when I create a branch git is automatically modifying the trailing slash of two directories in a way that I can't undo and I can't seem to stop the behavior.  Can anyone please help?  Here is an example  http://pastebin.com/raw/qvhRn9yH
15:23 ceaucari joined #git
15:23 wcpan joined #git
15:23 grawity those are symlinks, yes?
15:24 grawity remove them, recreate with the correct target, add/commit
15:25 Stevko Hello. I have two clones of a repo. If I run „git checkout -q HASH  && git log --oneline -- foo.xml | wc -l“ I get different results in each (1 or 16). Can that be correct? If I do blame on the file, I get completely different results where one of them shows every line from one commit which has ^ at the beginning (which should mean boundary commit – I am not certain what that means).
15:26 grawity is one of them a shallow clone?
15:26 Stevko I do not think so. How can I check?
15:26 grawity does .git/shallow exist?
15:26 ahmedelgabri joined #git
15:27 jwitko grawity, recreating them does not change the git diff
15:28 Bodger left #git
15:29 Stevko grawity: yes it does. So, does that explain it all? I cloned that thing long time ago, so I did not remember (or expected) that this could be the cause.
15:29 grawity Stevko: yeah, try `git fetch --unshallow` or `git fetch --depth=9999999` in it
15:29 grawity to download the parts of history that the clone originally omitted
15:30 synthroid joined #git
15:30 stantonk joined #git
15:31 wcpan joined #git
15:31 stantonk joined #git
15:31 EY joined #git
15:32 Stevko grawity: Thanks, that was the problem.
15:32 c0ded joined #git
15:32 Stevko I have another question. What is the difference between doing „git fetch -a“ and „git remote update“?
15:33 tm512 joined #git
15:33 jaguarmagenta joined #git
15:33 sangy joined #git
15:34 nut joined #git
15:34 grawity probably none
15:34 Gsham joined #git
15:36 thiago Stevko: the -a
15:37 mischat joined #git
15:37 akushner joined #git
15:38 wrouesnel1 joined #git
15:39 HerrThees joined #git
15:39 noteness joined #git
15:40 lindenle joined #git
15:40 eletuchy joined #git
15:41 benycze joined #git
15:41 benycze left #git
15:41 Tim-SEM joined #git
15:42 nofacade joined #git
15:44 eka joined #git
15:46 rgrinberg joined #git
15:46 CheckDavid joined #git
15:46 Tim-SEM joined #git
15:47 Balliad joined #git
15:48 Tim-SEM left #git
15:49 kpease joined #git
15:52 FabTG joined #git
15:54 c0ded joined #git
15:54 mintux joined #git
15:54 elsevero joined #git
15:54 mintux .gitignore could be different for each branch ?
15:54 noteness joined #git
15:55 _ikke_ yes
15:55 _ikke_ though when you merge, it will also merge the .gitignore
15:55 kpease joined #git
15:55 mdw joined #git
15:55 Xethron joined #git
15:56 lindenle joined #git
15:57 Noldorin joined #git
15:58 madewokherd joined #git
15:59 Corosauce joined #git
15:59 pantsman_ joined #git
15:59 noteness joined #git
16:00 hobodave_ joined #git
16:02 dreiss joined #git
16:03 baba_ joined #git
16:03 andyhoang joined #git
16:06 simon joined #git
16:08 elastix joined #git
16:09 thiago mintux: it's just a file. A file may be different in any branch.
16:09 mintux ah
16:10 zadock joined #git
16:11 sssilver joined #git
16:12 brandonw joined #git
16:12 totte joined #git
16:12 noteness joined #git
16:13 maestrojed joined #git
16:15 HeresJohny joined #git
16:15 Achylles joined #git
16:16 stantonk_ joined #git
16:16 c0ded joined #git
16:16 nicolas17 joined #git
16:16 nicolas17 hi
16:17 glauxosdever joined #git
16:17 subhojit777 joined #git
16:17 glauxosdever Hello, how can I view who cloned a repository?
16:18 nicolas17 is there a difference between how objects are formatted inside a pack and in loose objects?
16:18 pwnz0r joined #git
16:19 ril joined #git
16:19 thiago glauxosdever: in a multi-user Unix system? Well, check the owner of the directory.
16:19 thiago nicolas17: there's an extra layer of compression inside the pack (delta compression)
16:20 glauxosdever No, I mean. I have a remote repo, which I have access to. This is available for cloning.
16:20 thiago glauxosdever: ok
16:20 glauxosdever I'd like to see how many people cloned it.
16:20 thiago glauxosdever: so you want to know who cloned by looking at the original, not the clone?
16:20 glauxosdever Yes, if possible.
16:20 thiago glauxosdever: did you log the clones?
16:20 thiago glauxosdever: if so, look at your log
16:21 glauxosdever git logs?
16:21 thiago no, *your* logs
16:21 thiago your server logs
16:21 robbyoconnor joined #git
16:21 thiago git doesn't log that
16:22 stantonk joined #git
16:22 glauxosdever Ah, ok. Because I thought that once I saw some git logs, but apparently I didn't remember well.
16:22 thiago glauxosdever: they weren't git logs
16:22 nicolas17 the git internals book says loose-object blobs are prefixed by a 'blob {length}\0' header, and IIUC that's even part of the sha1 hash
16:22 thiago glauxosdever: they may have been gitolite logs
16:22 up_the_irons joined #git
16:23 nicolas17 I want to know if that header is in the compressed data inside a pack too
16:24 mutex_ joined #git
16:28 themayor joined #git
16:29 baba_ joined #git
16:29 c0ded joined #git
16:29 jwitko left #git
16:31 diogenese joined #git
16:31 InfoTest joined #git
16:33 averell joined #git
16:33 algun joined #git
16:34 kadoban joined #git
16:35 Eugene nicolas17 - AFAIK yes, the pack would have the blob's header inside of it. I've never taken one apart manually to verify that
16:36 mase-tech joined #git
16:36 fhmgufs left #git
16:36 acetakwas joined #git
16:36 stantonk joined #git
16:36 EY___ joined #git
16:37 LeBlaaanc joined #git
16:38 CJKinni joined #git
16:39 LeBlaaanc joined #git
16:41 mangolisk_ joined #git
16:42 baba_ joined #git
16:42 UTAN_dev_ joined #git
16:43 knutstrut joined #git
16:43 UTAN_dev_ joined #git
16:43 CJKinni` joined #git
16:45 CJKinni joined #git
16:46 c0ded joined #git
16:48 texinwien_ joined #git
16:48 bronson joined #git
16:48 notebox joined #git
16:49 hobodave joined #git
16:53 BSaboia how do I move a specific commit to another branch?
16:53 shinnya joined #git
16:54 kadoban BSaboia: Does cherry-pick do what you want?
16:54 fakenullie BSaboia: cherry pick I guess
16:54 BSaboia I am not 100% sure. I have a branch, quickfix1, then I want only a single commit from that branch to go to quickfix2 (which is a new branch, I will create only for that)
16:55 c0ded joined #git
16:56 MacWinner joined #git
16:57 Vinnie_win_w joined #git
16:57 fscala joined #git
16:59 BSaboia kadoban, fakenullie it seems that cherry-pick does the trick
17:01 zarel joined #git
17:01 Stevko left #git
17:02 baba_ joined #git
17:05 davidosomething joined #git
17:06 ygeLN joined #git
17:06 mbrzuzy joined #git
17:07 noidea joined #git
17:07 jonmorehouse joined #git
17:08 c0ded joined #git
17:08 AaronMT_ joined #git
17:13 jagob joined #git
17:13 EvilPenguin joined #git
17:16 mischat joined #git
17:16 moei joined #git
17:17 d4rklit3 joined #git
17:18 Vinnie_win joined #git
17:19 zarel joined #git
17:20 kyledr joined #git
17:21 CJKinni_ joined #git
17:23 fr33domlover joined #git
17:23 khmarbaise joined #git
17:23 khmarbaise joined #git
17:24 stantonk joined #git
17:25 relipse2 joined #git
17:26 thiago_ joined #git
17:27 Limes__ joined #git
17:28 eletuchy joined #git
17:31 ferr joined #git
17:31 mintux left #git
17:32 Pulp joined #git
17:33 josuebrunel joined #git
17:34 jaguarmagenta joined #git
17:34 aizex joined #git
17:34 akushner joined #git
17:34 Gsham joined #git
17:34 LeBlaaanc joined #git
17:36 kballou joined #git
17:36 rahtgaz joined #git
17:37 ajf- joined #git
17:37 UTAN_dev joined #git
17:38 c0ded joined #git
17:40 khmarbaise joined #git
17:40 Sasazuka joined #git
17:40 UTAN_dev_ joined #git
17:43 hahuang65 joined #git
17:43 akushner joined #git
17:44 stantonk_ joined #git
17:44 govg joined #git
17:45 fuchstronaut joined #git
17:45 Gloomy joined #git
17:46 nowhereman joined #git
17:47 f3r70rr35f joined #git
17:49 Psychiatrist joined #git
17:51 xnrand joined #git
17:51 InfoTest1 joined #git
17:52 jakesyl_mobile joined #git
17:54 dhollinger joined #git
17:54 govg joined #git
17:56 ELFrederich joined #git
17:57 mdw joined #git
17:58 prsn joined #git
17:59 zalatovo joined #git
17:59 ELFrederich I have a branch that I use for debugging.  It automatically logs me into the application with a hard coded password and kicks off some other stuff.  I'd like a suggestion for a workflow on how to do development off of this branch but not commit my debugging commit.
18:00 ELFrederich this debug branch is just a single commit that I keep rebassing off of master whenever I want to do development work
18:00 AaronMT joined #git
18:00 nyuszika7h joined #git
18:00 cfxd joined #git
18:01 fakenullie have a setting for debugging
18:01 roentgen joined #git
18:01 c0ded joined #git
18:02 bambams I used to have alias.start = checkout -tb, but that causes a lot of tracking of master which makes push angry. :\
18:02 b100s left #git
18:02 bambams So now I'm thinking of doing alias.start = checkout -b, and then alias.tmp = checkout -tb..
18:02 fakenullie ELFrederich: have a setting for debug, store password in settings file
18:02 ELFrederich ... right now I just do my bugfix commit on "debug", then I checkout master, cherry-pick debug, checkout debug and rebase master.  I don't see my bugfix re-applied, which is correct.
18:02 ELFrederich just wondering if there is a better way
18:02 ahmedelgabri joined #git
18:03 ELFrederich fakenullie: so you're saying make the stuff that I do for debugging part of the application itself?
18:03 xlegoman joined #git
18:03 fakenullie ELFrederich: you can keep that part as a separate file
18:03 ELFrederich fakenullie: that's always an option.  I was just wondering if there is a better way to do that from the Git perspective
18:03 fakenullie ELFrederich: but usually debug is a part of application source, yes
18:04 dreiss joined #git
18:06 bambams push.default seems to have gone to chaos.. :\
18:06 malide what is the purpose of the git user on a system, and will it mess anything up if I set its shell to /usr/bin/nologin ?
18:06 Akuli joined #git
18:06 Akuli Today i learned to use git like this http://dpaste.com/226QJF2
18:07 Akuli there's probably many things wrong
18:07 bambams malide: You should check with your distro/package. It's probably meant to be used for a git repository host like gitolite or something? So that git@ URIs can work. Depends though..
18:08 malide okay. Thanks for the advice :)
18:09 kpease joined #git
18:09 kballou joined #git
18:12 chitopunk joined #git
18:13 Balliad joined #git
18:13 wviana joined #git
18:14 mdw joined #git
18:16 nebg joined #git
18:17 kasisnu joined #git
18:17 elsevero joined #git
18:21 jason237 joined #git
18:22 rgrinberg joined #git
18:23 UTAN_dev joined #git
18:24 stantonk joined #git
18:26 Gsham joined #git
18:27 arooni joined #git
18:30 akushner joined #git
18:31 Zoddo left #git
18:32 totte joined #git
18:33 Mateon1 joined #git
18:33 jimi_ joined #git
18:35 AndroidLoverInSF joined #git
18:37 Shentino joined #git
18:37 kfunk joined #git
18:38 mischat joined #git
18:39 robbyoconnor joined #git
18:40 NeverDie joined #git
18:41 King_Hual` joined #git
18:42 AndroidLoverInSF joined #git
18:43 nedbat i'm running an ansible playbook on a virtualbox, and it seems stuck where it clones a git repo.  top shows "git-remote-https" as an active process.  What is that?
18:44 ojacobson the remote helper for https repos
18:45 robbyoconnor joined #git
18:45 nedbat ojacobson: so that's a normal part of "git clone https://...." ?
18:45 ojacobson and git fetch, and git ls-remote, and
18:45 nedbat ojacobson: any way to figure out why it is stuck?
18:45 ojacobson strace?
18:46 nedbat ojacobson: ok, i guess i should learn how to use that... :)
18:46 dreiss joined #git
18:48 fuchstronaut joined #git
18:51 dreiss_ joined #git
18:51 linuxmint joined #git
18:52 OnBrokenWings joined #git
18:53 CJKinni joined #git
18:54 diogenese joined #git
18:56 CJKinni joined #git
18:57 nnyk_ joined #git
19:00 dsdeiz joined #git
19:05 ahmedelgabri joined #git
19:06 jason237 joined #git
19:08 Limes_ joined #git
19:10 LeBlaaanc joined #git
19:11 dreiss_ joined #git
19:12 DolphinDream how do i set a branch to a given commit ? without checking out that branch first ?
19:12 _ikke_ git branch -f <branch> <commit>
19:12 DolphinDream hm.. intersting.
19:12 DolphinDream not update-ref ?
19:13 _ikke_ sure
19:13 DolphinDream not sure what update-ref does though
19:13 _ikke_ but update-ref is plumbing
19:13 _ikke_ It's a low-level tool
19:13 DolphinDream ic
19:13 _ikke_ But does what you want
19:13 _ikke_ You have to be more explicit though
19:13 DolphinDream kewl. thx _ikke_
19:13 nwkj86 joined #git
19:14 govg joined #git
19:14 fuchstronaut joined #git
19:14 _ikke_ git update-ref refs/heads/<branch> <commit>
19:14 DolphinDream good to know
19:15 multi_io joined #git
19:15 DrDaemonEye joined #git
19:16 peepsalot joined #git
19:22 King_Hual joined #git
19:22 King_Hual joined #git
19:24 yqt joined #git
19:25 kpease joined #git
19:26 stantonk joined #git
19:26 acetakwas joined #git
19:27 kpease joined #git
19:27 relipse2 joined #git
19:28 elastix joined #git
19:29 King_Hual joined #git
19:29 MattMaker joined #git
19:31 anu0 joined #git
19:31 stantonk joined #git
19:32 stantonk joined #git
19:33 LeMike joined #git
19:34 LeBlaaanc joined #git
19:36 NeverDie joined #git
19:41 r0bby_ joined #git
19:42 circ-user-iSXQf joined #git
19:42 akiva joined #git
19:44 linuxmodder joined #git
19:45 HerrThees joined #git
19:46 r0bby_ joined #git
19:48 satbyy joined #git
19:51 ahmedelgabri joined #git
19:55 Darcidride joined #git
19:55 govg joined #git
19:56 MrWoohoo joined #git
19:57 WizJin joined #git
19:58 r0bby_ joined #git
19:59 LeBlaaanc joined #git
20:01 steven_a_s joined #git
20:01 Gsham joined #git
20:01 jonmorehouse joined #git
20:01 m_antis joined #git
20:01 amdi_ joined #git
20:02 zincrokx joined #git
20:07 flopsec joined #git
20:08 pwnz0r joined #git
20:08 annoymouse joined #git
20:09 linuxmint joined #git
20:11 mbreedlove joined #git
20:11 Urbany joined #git
20:14 WayToDoor joined #git
20:15 IWishIKnew joined #git
20:15 cdg joined #git
20:15 acetakwas joined #git
20:15 King_Hual joined #git
20:15 drewo joined #git
20:16 cr0mulent joined #git
20:16 stantonk_ joined #git
20:18 satbyy joined #git
20:19 devxom joined #git
20:20 devxom left #git
20:21 ril joined #git
20:21 scottchiefbaker joined #git
20:21 robotroll joined #git
20:22 scottchiefbaker If someone sends a pull-request on github, what's the best way to test out that code? Add that repo as an upstream, and then checkout that branch?
20:24 moritz scottchiefbaker: https://gist.github.com/piscisaureus/3342247
20:24 nicolas17 left #git
20:24 gfixler joined #git
20:24 gkatsev you can also fetch it directly   git fetch $orig pull/$1/head:$2
20:24 rahtgaz joined #git
20:25 mda1 joined #git
20:25 moritz scottchiefbaker: if you configure git like that, it fetches pull requests automatically on "git fetch", which makes it easy to test locally
20:25 gkatsev meant to fill that out. but $orig is the origin (whether origin or upstream or whatnot), $1 would be the PR number, and $2 would be the name you want it to be locally
20:26 gkatsev but yeah, if you're doing a lot of PR work, what moritz linked makes it a lot easier
20:26 NeverDie joined #git
20:26 EY joined #git
20:27 moritz also, there are command line clients for github that have easy commands for fetching, merging and closing PRs
20:27 pckz joined #git
20:31 aizex joined #git
20:31 m1dnight_ joined #git
20:31 govg joined #git
20:31 xall joined #git
20:33 sorenb joined #git
20:33 dan2k3k4 joined #git
20:34 efco joined #git
20:36 fuchstronaut joined #git
20:37 mda1 joined #git
20:38 robogoat joined #git
20:40 stantonk joined #git
20:40 citizen-stig joined #git
20:41 dzho do we know of anything that explains all the pieces of that gist, rather than more-or-less "copy and paste, search and replace"
20:41 fuchstronaut joined #git
20:41 ahmedelgabri joined #git
20:44 MDRXB95AP joined #git
20:45 _ikke_ I would advise people to use git config than rather editing config files manually
20:45 xnrand joined #git
20:45 _ikke_ git config --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/origin/pr/*"
20:46 _ikke_ He even suggests it later
20:46 stantonk joined #git
20:47 radsy joined #git
20:48 f3r70rr35f joined #git
20:50 bittin joined #git
20:55 cr0mulent joined #git
20:56 kyledr joined #git
20:56 jimmybuffet joined #git
20:56 mbrzuzy joined #git
20:58 arooni joined #git
20:58 chrisshattuck joined #git
20:58 WaReZ joined #git
20:59 liquidjamm joined #git
20:59 JackFruh joined #git
20:59 aidalgol joined #git
21:00 BrianBlaze420 joined #git
21:00 bollullera joined #git
21:01 surfnturf_ joined #git
21:02 mda1 joined #git
21:03 josuebrunel joined #git
21:05 Success joined #git
21:06 Success how do I throw away all the old stuff on my local gi
21:06 Success t
21:08 NoImNotNineVolt that depends on how much of everything else you want to keep.
21:08 NoImNotNineVolt you can always format your disk.
21:08 NoImNotNineVolt or delete the parent directory. that's more surgical :P
21:08 howdoi joined #git
21:08 Psychiatrist joined #git
21:09 nnyk_ joined #git
21:09 sangy joined #git
21:09 m_antis joined #git
21:10 frenda joined #git
21:10 frenda Hi
21:12 invisbl joined #git
21:12 frenda https://git-scm.com/book/en/v2/Git-Tools-Submodules  --> Is it possible to link to a folder of a repo instead of a repo itself?!
21:12 nerium joined #git
21:12 frenda Quote: "It often happens that while working on one project, you need to use another project from within it"
21:12 frenda But
21:13 frenda I need to use a folder that is in another repo
21:13 nerium How do I know what branch HEAD points to? (only using git)
21:13 qsx git symbolic-ref HEAD
21:14 Success NoImNotNineVolt: In a repository (atom) say i've had it for like 3 years in git constantly updating, and it's grown to be like 8gb
21:14 Eugene Or `git status`, if you want it human-readable.
21:14 Success I want to move to head and forget the rest
21:14 NoImNotNineVolt i don't think git works like that.
21:14 NoImNotNineVolt though i suck at git :P
21:14 Success like all the ./.git/ files full of diff patches?
21:15 Success hmm maybe.
21:15 satifant so you _want_ to loose all your history?
21:15 ojacobson Success: backing up a step, this is a problem the linux kernel has actually solved
21:15 Success satifant: on my local machine... it's not like they wouldn't be "in the cloud"
21:15 nerium +qsx Thanks!
21:15 fr33domlover left #git
21:15 ojacobson they've solved it with truncated branches, plus grafts files that allow users to reconnect the truncated history into a single full history if they want to (after fetching all the pieces)
21:15 Success ojacobson: ironically, the linux kernel is one of the 3 directories giving me trouble...
21:16 rgrinberg joined #git
21:16 ojacobson building the truncated branches isn't terribly hard but you need to do some planning in advance
21:17 HenriettaSalt joined #git
21:17 elementalest joined #git
21:17 elementalest joined #git
21:18 qsx historian qsx speaking: we just discovered a git 1.5 on this computer
21:19 Eugene You poor sod
21:19 ojacobson nice
21:19 Eugene CentOS 4?
21:19 ojacobson dust it off and run a blind `git push --force` with it
21:19 frenda Is it possible to submodule a folder of a repo instead of a repo itself?!
21:19 qsx no
21:19 qsx lemote something something
21:19 Gsham joined #git
21:19 qsx step 1: export LC_ALL=C (nobody here speaks any chinese)
21:19 sbeller frenda: no
21:23 Kicer86 joined #git
21:25 mbreedlove joined #git
21:25 NeverDie When I want to diff two branches, isn't it $ git diff <branch1> <branch2> ?
21:25 ril joined #git
21:26 jamespullar joined #git
21:26 ahmedelgabri joined #git
21:26 texinwien_ joined #git
21:26 diogenese joined #git
21:27 nerium +qsx Is there a way to check what commit is currently being checkout? I tought HEAD was always pointing to whatever commit/branch/tag was used
21:27 frenda sbeller: a branch? What if I create a branch and delete all other things except target folder?
21:28 sbeller frenda: that should work
21:28 frenda Ah, great, thx
21:28 qsx nerium: yes, i just don’t remember it right now <_<
21:28 jamespullar can you determine what actual branch a pull request originated from if i've fetched locally? git fetch origin pull/$1/head:pr$1 && git checkout pr$1
21:29 mbreedlove joined #git
21:29 mellernoia joined #git
21:31 govg joined #git
21:31 mellernoia joined #git
21:32 nerium +qsx Any idea what to google for?
21:32 aizex joined #git
21:32 kadoban jamespullar: Probably can't tell what branch it came from, no.
21:32 emPi joined #git
21:33 mbreedlove joined #git
21:33 qsx nerium: ah, man git rev-parse
21:33 gitinfo nerium: the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html
21:33 tlaxkit joined #git
21:33 ril joined #git
21:33 mbreedlove joined #git
21:34 Gsham joined #git
21:34 gfixler joined #git
21:35 raijin joined #git
21:35 jaguarmagenta joined #git
21:35 jamespullar @kadoban guess i expected as much, thanks for the reply!
21:36 johnwhitton joined #git
21:37 kadoban jamespullar: The github command line thing may be able to tell you, I'm not sure if that'd be something they'd expose or not.
21:38 Caelum joined #git
21:39 ojacobson If you have the originating repo as a remote already and you're up to date on fetches, then `git branch --all --contains pr1234` may help
21:39 ojacobson if you don't, you'd need to get all of that info from github
21:40 qsx !git-spindle perhaps has some feature
21:40 gitinfo https://github.com/seveas/git-spindle is a handy tool to use the features of GitHub (and GH Enterprise), GitLab, BitBucket and possibly more from the command line.
21:42 tjbp joined #git
21:42 ajf- joined #git
21:44 jamespullar @ojacobson, git branch --all --contains pr1234 is exactly what i needed! thanks!
21:44 chitopunk joined #git
21:44 khmarbaise joined #git
21:45 LeMike_ joined #git
21:47 mischat joined #git
21:48 je_ joined #git
21:50 jstvz joined #git
21:51 |ifei5g00d joined #git
21:52 bronson joined #git
21:53 greg__ joined #git
21:54 Dougie187 left #git
21:59 mda1 joined #git
22:00 mbreedlove joined #git
22:04 aubar joined #git
22:04 fuchstronaut joined #git
22:05 luizhdinizf joined #git
22:05 jonmorehouse joined #git
22:06 st0opkid joined #git
22:07 SimonNa joined #git
22:08 italoacasas joined #git
22:10 italoacasas joined #git
22:11 docnvk joined #git
22:13 Pieplay joined #git
22:13 NeverDie How can I merge my branch to another branch?
22:14 r0bby_ joined #git
22:14 FuzzySockets joined #git
22:15 italoacasas joined #git
22:15 Nikesh joined #git
22:15 NeverDie Like if I want to merge branch <css-fixes> to <react>?
22:16 HenriettaSalt joined #git
22:17 Nikesh I've branched off master and made a bunch of changes.. one change that I just made -- not yet staged -- I'd like to commit against master, but not the rest of my branch yet.. Do I need to stash the unstaged changes, switch to master, then unstash?
22:17 vishal NeverDie: git checkout react; git merge css-fixes
22:17 NeverDie vishal: How can I do that without saving a new commit with all the stuff I have on this branch before I switch?
22:18 NeverDie It says some files need a merge first.
22:18 NeverDie I'm currently on the <css-fixes> branch.
22:18 vishal Nikesh: if the change is unstaged, you can !float everything uncommitted back to master, git add -i the changes you want on master, commit that, and float the rest back to your working branch
22:18 gitinfo Nikesh: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
22:19 vishal NeverDie: can you pastebin a !repro
22:19 gitinfo NeverDie: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
22:19 ojacobson NeverDie: finish or discard the merge you're in the middle of before starting another merge
22:20 NeverDie vishal: This is what I got: https://vomitb.in/GZdUGzzGqm
22:20 NeverDie ojacobson: How do I save all the changes I made then?
22:20 vishal what ojacobson said :)
22:20 ojacobson The same way you finish any other commit: stage the results, commit them
22:20 ojacobson you more or less can't "suspend" a merge so you can do something else. The UI has no way to do that.
22:21 NeverDie ojacobson: So git add all of it and then commit?
22:21 ojacobson Add what you meant to use as a merge result, then commit it.
22:21 NeverDie And then switch branches and then merge?
22:21 ojacobson my crystal ball says: you ran `git pull` (which runs `git merge`) and didn't read the output
22:21 ojacobson and didn't realize git-pull is a merge command
22:22 NeverDie ojacobson. I did git fetch first and then git merge.
22:22 NeverDie But I didn't see anything happen lol.
22:22 NeverDie Until I did git pull.
22:23 aubar joined #git
22:24 mizu_no_oto joined #git
22:25 amikiri joined #git
22:25 UTAN_dev_ joined #git
22:27 |2701 joined #git
22:29 italoacasas joined #git
22:33 aizex joined #git
22:35 Gloomy joined #git
22:39 freekevin help
22:40 freekevin changes not staged for commit?
22:41 freekevin oh nm didnt add these directories
22:41 johnmilton joined #git
22:42 gaen joined #git
22:45 Gsham joined #git
22:45 chitopunk joined #git
22:48 LeBlaaanc joined #git
22:50 zalatovo joined #git
22:55 mizu_no_oto joined #git
22:56 Shentino joined #git
22:57 sgen joined #git
22:58 johnmilton joined #git
22:59 kasisnu joined #git
23:01 jonmorehouse joined #git
23:01 waterCreature joined #git
23:03 emPi joined #git
23:05 drewo joined #git
23:06 fuchstronaut joined #git
23:08 surfnturf_ joined #git
23:08 ochorocho__ joined #git
23:08 weox joined #git
23:09 mischat joined #git
23:09 kballou left #git
23:10 BlessJah joined #git
23:11 kyledr joined #git
23:12 jimi_ joined #git
23:14 r0bby_ joined #git
23:16 _28_ria joined #git
23:18 ffabi joined #git
23:23 boombatower joined #git
23:23 boombatower joined #git
23:24 madewokherd joined #git
23:28 bollullera left #git
23:29 eletuchy joined #git
23:29 tobyn joined #git
23:31 m_antis joined #git
23:34 nidr0x joined #git
23:35 jagob joined #git
23:35 BlessJah joined #git
23:36 jaguarmagenta joined #git
23:36 johnwhitton Newbie question
23:37 johnwhitton I did a git clone -b branch repository
23:37 R3AP3ER joined #git
23:37 johnwhitton and now I want to access branch2 locally
23:38 johnwhitton I tried git checkout branch2
23:38 johnwhitton but I got the error error: pathspec 'beta' did not match any file(s) known to git.
23:38 johnwhitton do I need to clone branch 2 into a seperate local directory to work on it?
23:41 R3AP3ER left #git
23:43 gaen joined #git
23:45 BlessJah joined #git
23:47 R34PER joined #git
23:48 amikiri joined #git
23:49 mizu_no_oto joined #git
23:51 d4rklit3 joined #git
23:52 Gsham joined #git
23:52 Elurung joined #git
23:52 Eugene johnwhitton - clone fetches all branches, but only one can be checkout-ed at a time. `git branch -vva` will show you all branches, local and remote
23:52 Elurung left #git
23:53 Eugene johnwhitton - the magic words you want are something like `git checkout -b branch2 origin/branch2`; this makes a local copy of branch2 for you
23:55 johnwhitton wow a lot of branches :)
23:56 netj joined #git
23:56 ojacobson every repo has its own, independent set of branches
23:58 johnwhitton Thanks Eugene and ojacobson ;)
23:59 fstd joined #git

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