Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-07-16

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

All times shown according to UTC.

Time Nick Message
00:10 watersoul joined #git
00:12 DaffyDuck_ joined #git
00:12 buffal0 joined #git
00:18 Cabanossi joined #git
00:20 TbobbyZ joined #git
00:21 DaffyDuck_ I'm looking for a way to keep a non-1:1 mirror in sync. I want it to be 1:1 apart from not deleing my own branches.
00:21 DaffyDuck_ Specifically, the answer to this: https://stackoverflow.com/questions/43891528/mirroring-git-with-private-branches
00:21 nixjdm_ joined #git
00:22 DaffyDuck_ I'm using exactly those commands, and the push deletes all branches in my self-hosted repo.
00:23 DaffyDuck_ I can't figure out how to accomplish this. Any hints?
00:23 dsdeiz joined #git
00:23 dsdeiz joined #git
00:24 TbobbyZ joined #git
00:27 sam_c Hi, is it possible to change the default gitweb branch view?
00:28 lelexia joined #git
00:28 hahuang65 joined #git
00:28 a3Dman joined #git
00:30 rorro joined #git
00:31 kadoban joined #git
00:33 Noldorin joined #git
00:43 Noldorin joined #git
00:44 lelexia joined #git
00:46 edvb joined #git
00:50 arifuzzaman joined #git
00:50 bambs_ joined #git
00:51 bambs joined #git
00:52 Hyp3ri0n joined #git
00:53 tnecniv joined #git
00:55 Hyp3ri0n joined #git
00:57 blr joined #git
00:58 oprypin joined #git
01:02 finalbeta joined #git
01:12 yohnnyjoe joined #git
01:15 kadoban joined #git
01:15 armyriad joined #git
01:17 navidr joined #git
01:18 Cabanossi joined #git
01:20 chachasmooth joined #git
01:21 nixjdm_ joined #git
01:25 rda-mac joined #git
01:28 blocky left #git
01:28 Yondering joined #git
01:29 hahuang65 joined #git
01:29 sunri5e joined #git
01:32 tymczenko joined #git
01:38 btree left #git
01:41 beerdrop joined #git
01:43 dreiss joined #git
01:47 chachasmooth joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and Cthulian shell scripts | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.13.2 | Getting "cannot send to channel"? /msg gitinfo .voice | Today's featured git command: git-rebase. Its still written in Shell. Not a joke. https://github.com/git/git/blob/master/git-rebase.sh
01:50 bambs joined #git
01:52 juvenal joined #git
01:53 bronson joined #git
01:53 d^sh joined #git
01:55 rewt joined #git
01:58 j08nY joined #git
02:01 thebope joined #git
02:02 MrBiogene joined #git
02:04 rivalomega joined #git
02:04 anuxivm left #git
02:05 pks joined #git
02:10 nowhere_man joined #git
02:11 Devastator joined #git
02:14 Anja_ joined #git
02:14 Devastator_d joined #git
02:14 chat___ joined #git
02:15 akushner joined #git
02:18 maxxe joined #git
02:18 maxxe left #git
02:19 will_ joined #git
02:19 will_ hello
02:19 gitinfo will_: 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.
02:19 will_ do you guys know how i can clone a repo into /var/www/html for my server?
02:21 nixjdm_ joined #git
02:25 lagothrix joined #git
02:29 TiglatePileser joined #git
02:30 chachasmooth joined #git
02:31 theiostream joined #git
02:35 theiostream joined #git
02:42 TiglatePileser joined #git
02:45 juvenal joined #git
02:49 lb1c joined #git
02:51 Vortex35 joined #git
02:57 slappymcfry joined #git
02:58 cyphase joined #git
02:59 ecuanaso joined #git
03:01 mostlybadfly joined #git
03:02 buffal0 joined #git
03:05 Diaoer joined #git
03:07 cyphase joined #git
03:07 deepak joined #git
03:13 Cl0udN9ne joined #git
03:15 khan joined #git
03:16 khan left #git
03:18 hash-z3r0 joined #git
03:19 jakogut__ joined #git
03:21 nixjdm_ joined #git
03:21 Diaoer joined #git
03:22 hash-z3r0 joined #git
03:23 daivyk joined #git
03:30 Devastator if a folder doesn't have .git anymore, how can "git branch -a" still returns master?
03:30 hahuang65 joined #git
03:30 Devastator s/can/come
03:31 justan0theruser joined #git
03:32 chris_wot joined #git
03:34 donmichelangelo joined #git
03:36 Diaoer joined #git
03:36 fstd_ joined #git
03:41 bambs joined #git
03:44 jon-mac joined #git
03:47 justanotheruser joined #git
03:47 Cabanossi joined #git
03:47 Murr joined #git
03:48 watersoul joined #git
03:50 buffal0 joined #git
03:52 cyphase joined #git
03:53 Lyqyd joined #git
03:54 bronson joined #git
04:00 nd joined #git
04:01 masuberu joined #git
04:04 z8z joined #git
04:04 regedit joined #git
04:09 novae joined #git
04:09 novae joined #git
04:10 armyriad joined #git
04:15 oskarkv joined #git
04:18 bambs joined #git
04:19 cttttt joined #git
04:21 chigang__ joined #git
04:22 nixjdm_ joined #git
04:24 dsdeiz_ joined #git
04:48 ogny joined #git
04:48 rohitpaulk joined #git
04:56 cebula joined #git
04:56 kadoban joined #git
04:59 ecuanaso joined #git
05:05 Anja_ joined #git
05:15 dpl joined #git
05:21 nixjdm_ joined #git
05:21 blr joined #git
05:25 bket joined #git
05:27 acalycine joined #git
05:27 acalycine Hey. I just used BFG to try and remove sensitive keys from my commit history, but it seems to have duplicated every single commit. One copy of each commit has the keys removed, the other doesn't.
05:28 acalycine How could I fix this?
05:31 hahuang65 joined #git
05:35 bambs joined #git
05:47 Murr joined #git
05:50 acalycine Anybody?
05:52 TheFuzzball joined #git
05:56 slappymcfry joined #git
05:56 Sasazuka joined #git
05:56 bronson joined #git
05:56 ecuanaso joined #git
05:59 TomyLobo joined #git
06:00 acalycine joined #git
06:02 Cabanossi joined #git
06:04 hahuang65 joined #git
06:10 ahr3n joined #git
06:11 m4sk1n joined #git
06:22 nixjdm_ joined #git
06:24 shiranuidong joined #git
06:25 shiranuidong joined #git
06:26 shiranuidong joined #git
06:27 imack joined #git
06:28 shiranuidong joined #git
06:32 svm_invictvs joined #git
06:32 Cabanossi joined #git
06:35 basiclaser joined #git
06:42 rominronin joined #git
06:47 schleppel joined #git
06:52 _ikke_ acalycine: Where do you see these commits?
06:53 acalycine I've just redone the commits in a seperate repo, with all my git history. Should be good now.
06:53 acalycine I saw them in the commit history list on GitHub
06:54 _ikke_ If you pushed it to github, you should view those passwords as compromised
06:55 acalycine Private repo.
06:55 acalycine And they were API keys, which I have reset.
07:01 przemoc joined #git
07:03 ojdo joined #git
07:05 clickjack joined #git
07:06 acalycine Does anybody use Git in Atom? The GUI.
07:06 acalycine I'm trying to work out where I can view my commits before I push them.
07:08 energizer joined #git
07:10 SteffanW joined #git
07:18 Tobbi joined #git
07:21 zxd I am doing /usr/bin/git merge -q --squash -s recursive -Xsubtree=folder/foo remote  how to always choose the remote version ?
07:21 nixjdm_ joined #git
07:21 zxd when doing the merge
07:22 ShapeShifter499 joined #git
07:23 zxd -s theirs  ?
07:25 ejnahc joined #git
07:26 Murii joined #git
07:27 zxd https://git-scm.com/docs/git-merge  is confusing not sure which part is of -X and which is of -s
07:29 Solvaring joined #git
07:29 przemoc joined #git
07:31 tarkus joined #git
07:32 Cabanossi joined #git
07:33 opalepatrick joined #git
07:35 SkyPatrol_ joined #git
07:36 geoid joined #git
07:38 ogny joined #git
07:41 Murii joined #git
07:42 dreiss joined #git
07:46 zxd git merge --abort
07:46 zxd fatal: 'merge' is not possible because you have unmerged files.
07:46 zxd Please, fix them up in the work tree, and then use 'git add/rm <file>' as
07:46 zxd appropriate to mark resolution and make a commit, or use 'git commit -a'.
07:47 Murr joined #git
07:48 _Patrick_ joined #git
07:49 Gustavo6046 joined #git
07:50 acalycine joined #git
07:51 acalycine joined #git
07:51 AndreasLutro there is no merge --abort option - you can do `git reset --hard master` (replace master with whatever branch/commit you want) to get back to where you were
07:51 acalycine joined #git
07:52 AndreasLutro oh wait there is a git merge --abort, hm
07:52 AndreasLutro zxd: what version of git are you on?
07:52 zxd I did git reset --merge and it worked
07:53 zxd git version 1.7.1
07:53 zxd AndreasLutro:
07:54 AndreasLutro ah yeah, merge --abort was added in 1.7.4
07:54 AndreasLutro but reset --merge is apparently the same thing basically
07:56 hudu joined #git
07:57 bronson joined #git
07:59 hudu joined #git
08:01 _main_ joined #git
08:02 _main_ joined #git
08:02 yuken joined #git
08:04 __main__ joined #git
08:05 hahuang65 joined #git
08:06 will__ joined #git
08:09 will_ joined #git
08:09 theoceaniscool joined #git
08:12 rominronin joined #git
08:12 Kartagis left #git
08:13 vuoto joined #git
08:14 peepsalot joined #git
08:14 albel727 joined #git
08:15 zxd I used -Xtheirs in: /usr/bin/git merge -q --squash -s recursive -Xsubtree=some/folder -Xtheirs remote  ,but still CONFLICT (add/add): Merge conflict in ... git status also shows #       both added:
08:16 dersand joined #git
08:16 _28_ria joined #git
08:18 Gustavo6046 joined #git
08:18 zxd how to do a merge but always choose theirs version  /usr/bin/git merge -q --squash -s theirs dosen't exist -s theirs stategy
08:18 yuken left #git
08:20 jrm2 joined #git
08:21 nixjdm_ joined #git
08:24 dsdeiz joined #git
08:24 dsdeiz joined #git
08:26 flavius joined #git
08:45 t-mart joined #git
08:53 ok91 joined #git
08:53 canoon joined #git
08:55 Mission-Critical joined #git
09:12 Puffball joined #git
09:13 chachasmooth joined #git
09:15 Puffball joined #git
09:19 venmx joined #git
09:20 Puffball joined #git
09:21 iLembus joined #git
09:21 bambs joined #git
09:21 MissionCritical joined #git
09:22 nixjdm_ joined #git
09:28 konsolebox joined #git
09:31 cagedwisdom joined #git
09:32 catsup joined #git
09:33 catsup joined #git
09:37 sunri5e joined #git
09:39 Masber_080 joined #git
09:44 geoid joined #git
09:45 masuberu joined #git
09:47 shinnya joined #git
09:56 rorro joined #git
09:56 opalepatrick_ joined #git
09:58 bronson joined #git
10:01 adamru joined #git
10:03 OtakuSenpai joined #git
10:06 hahuang65 joined #git
10:07 iLembus_ joined #git
10:10 Puffball joined #git
10:11 visual joined #git
10:13 oneforall2 joined #git
10:14 oneforall2 how do you clone and keep it as the same dates ?
10:15 Es0teric joined #git
10:16 cbreak git does not store dates
10:16 PioneerAxon joined #git
10:17 Cabanossi joined #git
10:18 opalepatrick joined #git
10:19 bambs joined #git
10:21 nixjdm_ joined #git
10:29 YuGiOhJCJ joined #git
10:31 valhala_22 joined #git
10:37 rohitpaulk joined #git
10:38 Gurkenglas joined #git
10:38 oneforall2 left #git
10:47 aax joined #git
10:51 ZyX-I joined #git
10:53 valhala_22 joined #git
10:56 jameser joined #git
11:00 iLembus__ joined #git
11:00 n-st joined #git
11:01 valhala_22 joined #git
11:02 jameser_ joined #git
11:03 dostoyevsky joined #git
11:04 dostoyevsky Does it make sense to want to check in like 12G of data into git?  I'd say it's like 500K python code + 12g static data... I just want to make sure the data is available in exactly that way when I developed it
11:06 _ikke_ dostoyevsky: You might want to look into !media
11:06 gitinfo dostoyevsky: [!annex] git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
11:06 dostoyevsky Will something like LFS ever be part of git out of the box?
11:07 _ikke_ At least not any time soon
11:07 digitalway joined #git
11:08 dostoyevsky Ok, could I just put 12G of data on github?  They are public data sets but I amnot sure if I actually would be allowed to put them online
11:08 dostoyevsky (LFS uses github I read)
11:10 _ikke_ LFS can use any service that implents it
11:10 _ikke_ implements*
11:12 Cl0udN9ne joined #git
11:18 Bubiah joined #git
11:20 dostoyevsky _ikke_: Ok, good to know.  Thanks!
11:21 Masber_080 joined #git
11:22 cstratak joined #git
11:22 nixjdm_ joined #git
11:23 Nemoy joined #git
11:26 Nemoy left #git
11:29 Nemoy joined #git
11:29 cebor joined #git
11:31 n-st joined #git
11:33 nisseni joined #git
11:34 polyrob joined #git
11:41 bluesm joined #git
11:43 cdown joined #git
11:44 fragment3 joined #git
11:46 dpl joined #git
11:47 Murr joined #git
11:47 fragment3 joined #git
11:49 rorro joined #git
11:49 m0viefreak joined #git
11:52 ok91 joined #git
11:52 nomad242 joined #git
11:54 vignesh joined #git
11:57 blr joined #git
11:59 bronson joined #git
12:01 Gurkenglas joined #git
12:03 n-st- joined #git
12:07 hahuang65 joined #git
12:07 Gustavo6046 joined #git
12:07 n-st- joined #git
12:08 Bubiah joined #git
12:09 n-st joined #git
12:09 teroshan joined #git
12:11 peepsalot joined #git
12:11 kchr joined #git
12:13 n-st- joined #git
12:13 Bubiah joined #git
12:14 kchr i'm looking for a way to organize the many local working copies for various depdencies i keep on my dev machines. i'm thinking about a git clone wrapper that defaults to a specific path on the system and stores the repo in a folder hierarchy, like hostname.com/path/reponame
12:15 kchr similar to the golang path structure for libs, to not accidently checkout copies of the same repo
12:15 n-st- joined #git
12:16 kchr the intent being to reduce duplicate working copies, and have some kind of directory-based sorting of them
12:16 kchr has this been done?
12:17 kchr for example a repository at http://githost.com/user/coolproject.git would be checked out with relative path githost.com/user/coolproject/
12:20 j08nY joined #git
12:20 dendazen joined #git
12:22 imack joined #git
12:22 nixjdm_ joined #git
12:25 dsdeiz_ joined #git
12:25 dpl joined #git
12:30 digitalway joined #git
12:33 phinxy joined #git
12:34 vuoto joined #git
12:37 snowkidind joined #git
12:38 onmeac joined #git
12:41 Es0teric joined #git
12:42 staafl joined #git
12:45 VaultTec joined #git
12:46 govg joined #git
12:47 weakdan joined #git
12:47 Bubiah joined #git
12:51 digitalway joined #git
12:53 CussBot joined #git
12:57 cbreak dostoyevsky: git lfs sucks
12:57 cbreak in my experience ...
12:57 cbreak it's some nasty hack on top of http, which is both slow and inefficient
12:58 cbreak took me half a day to push a few gb
12:58 cbreak (with a network link that could upload that in a minute at most)
13:02 beaky hello
13:02 beaky can i amend past commit messages without a rebase
13:04 jast no. all the descendant commits need to be rewritten, no way around that
13:05 jast there's git commit --amend to change the message for the most recent commit, though
13:05 cyphase joined #git
13:08 iLembus joined #git
13:10 zxd is it possible to do a git rebase  without commit at the end?
13:10 jast what do you mean by 'without commit at the end'?
13:11 hudu joined #git
13:11 cbreak zxd: define "end"
13:12 zxd something similar to rsync of two directories
13:13 zxd rsync from one folder to another but using git commands
13:13 zxd trying to achive that
13:13 cbreak no
13:13 zxd with --delete
13:13 cbreak git does not transfer data that is not committed
13:14 cbreak rebase is a completely local operation to rewrite history
13:14 cbreak it is 100% pointless without committing
13:14 cbreak because without committing, no new history would be created
13:15 Bhootrk_ joined #git
13:16 altendky joined #git
13:16 zxd ok different question,  using git pull --rebase  from a repository with a long history that was a fork of another repository but with a complety different history only shared directories and file structures  afterwards I ended up with the history of only one of the repositories
13:16 jaeckel joined #git
13:17 zxd it says if there were patches alreay appiled they aren't rebased?
13:17 zxd in the docs that's the reason?
13:17 PioneerAxon joined #git
13:17 zxd reapplied
13:18 cbreak rebase will apply patches
13:18 cbreak if it's already applied, the patch commits will vanish
13:18 cbreak the state they apply of course is already there
13:19 hash-z3r0 joined #git
13:19 iLembus_ joined #git
13:20 cam27 joined #git
13:20 nixjdm_ joined #git
13:24 nowhere_man joined #git
13:24 iLembus joined #git
13:30 Bubiah joined #git
13:30 manuelschneid3r joined #git
13:33 tseo joined #git
13:35 ok91 joined #git
13:38 glad joined #git
13:42 satifant joined #git
13:42 mentazoom joined #git
13:44 Darcidride joined #git
13:45 cfosu joined #git
13:45 digitalway joined #git
13:47 Murr joined #git
13:49 dan2k3k4 joined #git
13:50 revolve joined #git
13:50 revolve how does git fare with >1tb objects?
13:51 cbreak not
13:51 cbreak I'd avoid git for files bigger than a few mb
13:51 revolve thanks
13:51 revolve is there anything that can be done to remediate this?
13:52 cbreak not using git
13:52 cbreak there are some overlays you can use instead
13:52 cbreak like git-annex, or the crappy git lfs
13:52 immae revolve: http://git-annex.branchable.com/
13:52 revolve what're the limiting factors to versioning large objects?
13:52 revolve thanks, immae
13:52 immae ups someone was faster
13:52 cbreak ram
13:52 cdown joined #git
13:53 cbreak and time
13:53 cbreak and bandwidth
13:53 cbreak and storage
13:54 revolve thanks for hipping me to git-annex
13:56 ij So git-annex is like using a remote, but without noticing it? :)
13:58 revolve left #git
14:00 dan2k3k4 joined #git
14:00 bronson joined #git
14:00 _ikke_ ij: from what I understand, git annex is meant to keep track of what you stored where
14:02 Cabanossi joined #git
14:03 blackwind_123 what is this command called as 'git checkout -- .'
14:04 zivester joined #git
14:04 theiostream joined #git
14:05 dave0x6d joined #git
14:05 _ikke_ blackwind_123: sorry, what do you mean?
14:06 Rotaerk_ joined #git
14:07 blackwind_123 i was following a git tutorial video... so there was a git command which revert the changes , so i need more info on that command but unfortunatley he didnt say what that command is called as...
14:07 heroux joined #git
14:07 blackwind_123 is there any naming for that command...
14:07 blackwind_123 _ikke_ : ^
14:07 jast !revert
14:07 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
14:07 hahuang65 joined #git
14:09 iLembus joined #git
14:09 blackwind_123 i knew about reset and revert commands, but that guy used checkout -- so i am confused
14:09 anuxivm joined #git
14:10 _ikke_ it does not have a specific name
14:10 jast if you pass a path to checkout as in that example, the files matching that part are overwritten with the version in the index
14:10 _ikke_ it's just checking out a file
14:10 jast meaning they are reset to whatever version you've got staged
14:11 buffal0 joined #git
14:11 blackwind_123 okie i think i got that thanks _ikke_ : jast :
14:12 rominron_ joined #git
14:13 lagothrix joined #git
14:14 dan2k3k4 joined #git
14:16 ij blackwind_123, Are you confused about the "--" part?
14:16 ij slash wondering
14:17 lelexia joined #git
14:18 jameser joined #git
14:18 blackwind_123 both , never used it but i think it is the way to get the file (it will avoid unintentional checkout of branch itself incase if im trying to checkout the file-having-same-name-as-a-brach)
14:18 dan2k3k4 joined #git
14:19 jast exactly
14:20 h12o joined #git
14:20 blackwind_123 :)
14:21 nixjdm_ joined #git
14:24 dan2k3k4 joined #git
14:26 rohitpaulk joined #git
14:29 madewokherd joined #git
14:32 rohitpaulk joined #git
14:34 t-mart joined #git
14:36 Rashad joined #git
14:37 gugah joined #git
14:38 buffffal00 joined #git
14:39 imack joined #git
14:40 Murii joined #git
14:40 acalycine joined #git
14:44 CBF16888 joined #git
14:45 CBF16888 joined #git
14:47 CBF16888 joined #git
14:48 Kaisyu joined #git
14:48 buffal0 joined #git
14:51 stoopkid joined #git
14:58 rohitpaulk joined #git
15:02 Gurkenglas joined #git
15:04 cite joined #git
15:10 orbyt_ joined #git
15:11 Zfih joined #git
15:13 mikecmpbll joined #git
15:15 buffal0 joined #git
15:17 rohitpaulk joined #git
15:19 zxd cat .git/refs/remotes/origin/HEAD  says   ref: refs/remotes/origin/master  but I don't have this file
15:19 bremner could be a packed ref
15:19 qsx zxd: it isn’t necessarily a file
15:19 _ikke_ zxd: git show-ref refs/remotes/origin/master
15:20 lelexia joined #git
15:20 qsx don’t poke around in .git unless you know what you are doing.
15:20 _ikke_ qsx: just peeking to understand git is not bad
15:20 qsx (arguably nothing will break per se just by peeking, but if you don’t know it well, the information might be misleading)
15:21 jnj joined #git
15:21 nixjdm_ joined #git
15:22 jnj Hey guys, so I just set up git on my dreamhost server. I'm trying to push up a wordpress website all at once but the process gets stopped since it's doing too much for the host. What would be the best way for me to break up my push? Should I just add increments of files? Is there a way to split up my commit to multiple?
15:23 l2y what is the strategy of putting people's names into the copyright notice of the file? do I put everyone who has ever changed the file according to git blame? what if the file is maintained by the group of people? how do you solve it?
15:24 zxd if I don't do any pushes or commits to a repository is it safe to run: after git fetch --all,   cat .git/refs/remotes/origin/HEAD > .git/refs/heads/master ; git reset --hard master  ?
15:24 _ikke_ zxd: no
15:24 _ikke_ zxd: use git commands to manipulate the repo
15:24 kroete joined #git
15:24 opalepatrick joined #git
15:29 hudu joined #git
15:30 zxd _ikke_: what's the git command to update my master ref to what .git/refs/remotes/origin/HEAD is pointing ?
15:31 _ikke_ git checkout -B master origin/HEAD should do the trick
15:32 rohitpaulk joined #git
15:35 zxd git reset --hard  doesn't delete untracked files?
15:35 _ikke_ nope
15:36 _ikke_ you want man git clean for that
15:36 gitinfo the git-clean manpage is available at https://gitirc.eu/git-clean.html
15:38 zxd thanks
15:47 svm_invictvs joined #git
15:47 Murr joined #git
15:49 skered joined #git
15:50 valhala_22 joined #git
15:51 thiago joined #git
15:55 diogenese joined #git
15:58 Lauven joined #git
15:59 hudu joined #git
16:00 gareppa joined #git
16:01 bronson joined #git
16:07 orbyt_ joined #git
16:09 hahuang65 joined #git
16:15 venmx joined #git
16:16 Rashad joined #git
16:18 JanC_ joined #git
16:21 nixjdm_ joined #git
16:22 synthmeat joined #git
16:22 hahuang65 joined #git
16:24 h12o joined #git
16:25 dsdeiz joined #git
16:25 menip joined #git
16:27 venmx joined #git
16:28 Es0teric joined #git
16:30 ZyX-I joined #git
16:31 n-st joined #git
16:32 Cabanossi joined #git
16:33 svm_invictvs joined #git
16:36 Bubiah joined #git
16:37 Tobbi joined #git
16:43 edvb joined #git
16:43 dsdeiz joined #git
16:44 albel727 joined #git
16:51 eshlox joined #git
16:51 gloomy joined #git
16:57 shgysk8zer0 joined #git
16:59 dsdeiz joined #git
16:59 dreiss joined #git
17:04 deep-book-gk_ joined #git
17:05 Phylock joined #git
17:05 deep-book-gk_ left #git
17:05 Bubiah joined #git
17:07 deep-book-gk_ joined #git
17:07 buffal0 joined #git
17:09 deep-book-gk_ left #git
17:10 rewt joined #git
17:10 arifuzzaman joined #git
17:14 dsdeiz joined #git
17:14 dsdeiz joined #git
17:18 shgysk8zer0 joined #git
17:19 Devastator joined #git
17:21 nixjdm_ joined #git
17:22 energizer joined #git
17:24 blackwind_123 joined #git
17:24 m0viefreak joined #git
17:24 tnecniv joined #git
17:25 digitalway joined #git
17:26 Es0teric joined #git
17:27 jaziz joined #git
17:28 overlord_tm joined #git
17:35 Noldorin joined #git
17:41 buffal0 joined #git
17:47 Guest82335 joined #git
17:47 Murr joined #git
17:48 rohitpaulk joined #git
17:51 imack_ joined #git
17:53 GT4066 joined #git
17:53 MeltedLux joined #git
18:00 dege joined #git
18:02 bronson joined #git
18:03 rorro joined #git
18:14 tymczenko joined #git
18:18 bket joined #git
18:21 nixjdm_ joined #git
18:22 hahuang65 joined #git
18:26 high_fiver joined #git
18:28 conarch joined #git
18:29 netj joined #git
18:29 SteffanW joined #git
18:30 bronson joined #git
18:31 noobstrap joined #git
18:31 digitalway joined #git
18:32 Cabanossi joined #git
18:33 noobstrap joined #git
18:35 salamanderrake_ joined #git
18:36 acalycine joined #git
18:36 acalycine joined #git
18:37 noobstrap joined #git
18:37 Zfih_ joined #git
18:40 tarkus joined #git
18:44 theoceaniscool joined #git
18:45 Gustavo6046 joined #git
18:46 salamanderrake joined #git
18:46 rohitpaulk joined #git
18:48 YuGiOhJCJ joined #git
18:50 will__ joined #git
18:51 kkiero joined #git
18:52 KV joined #git
18:52 al-damiri joined #git
18:54 tymczenko joined #git
18:57 robotroll joined #git
19:00 high_fiver joined #git
19:04 mentazoom joined #git
19:05 boombatower joined #git
19:07 rostero joined #git
19:08 TheFuzzball joined #git
19:09 jnj joined #git
19:09 nowhere_man joined #git
19:13 TheFuzzb_ joined #git
19:15 dsdeiz joined #git
19:20 nixjdm_ joined #git
19:22 andai_ joined #git
19:23 creshiem joined #git
19:23 TheFuzzball joined #git
19:23 nowhere_man joined #git
19:24 creshiem joined #git
19:28 creshiem joined #git
19:29 jnj joined #git
19:30 jnj Hey guys, so I created a commit but I want to delete the commit. I haven't pushed anything to the remote repository yet - how would I go about doing this?
19:30 _ikke_ jnj: last commit?
19:31 jnj _ikke_, nah this is the very first commit - I create the commit and haven't pushed it yet and the remote repository is empty - I just want to delete the commit
19:33 _ikke_ jnj: ok, this is a bit of a special situation then
19:33 _ikke_ Do you also want to get rid of the changes?
19:33 _ikke_ or just undo the commit?
19:33 ephemer0l_ joined #git
19:35 bitterlim joined #git
19:35 jnj _ikke_, I just want to undo the commit. Basically I have git set up on a dreamhost server and I'm trying to push an entire wordpress website over but as it turns out its pushing too much and causing dreamhost to shut down the process. So basically I want to just push over the website in incremental commits
19:36 rewt are you trying to use git to !deploy your website?
19:36 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
19:36 Gurkenglas joined #git
19:36 jnj rewt, nah I just want to have the website set up on version control
19:37 jnj basically I did git add . and it added everything, and I just want to get rid of that commit and send over the website in smaller commits
19:37 _ikke_ jnj: because it's the first commit, you have to do: git update-ref -d refs/heads/master; git reset
19:37 jnj _ikke_, sweet Ill try it out and let you know
19:38 chase joined #git
19:38 jnj _ikke_, perfect it worked!
19:39 _ikke_ That basically returns the repo in the state of a new repo
19:41 upperdeck joined #git
19:42 vise890 joined #git
19:45 salamanderrake joined #git
19:47 Murr joined #git
19:47 daithioc joined #git
19:48 MacWinne_ joined #git
19:53 robotroll joined #git
19:56 user2468 joined #git
19:57 theiostream joined #git
19:58 inovas joined #git
20:02 frobnic joined #git
20:02 Cabanossi joined #git
20:05 Celelibi joined #git
20:08 hahuang65 joined #git
20:10 Sasazuka joined #git
20:10 hudu joined #git
20:18 zxd hi
20:21 nixjdm_ joined #git
20:21 conarch joined #git
20:23 zxd when would I want to use git push --mirror ? this also pushes refs/remotes/  ? if I clone from one repository then mirror to another (I am the intermediate) then the refs created by the clone under refs/remotes will be pushed to the other repository ?
20:26 dsdeiz_ joined #git
20:26 Ring0`` left #git
20:27 _ikke_ yeah, normally, only refs under refs/heads are push
20:30 kadoban_ joined #git
20:32 seishun joined #git
20:33 khatri joined #git
20:33 seishun hey, trying to cherry-pick a commit that happens to have an invalid name, so getting "fatal: empty ident name". what would be the easiest way to apply the changes in it
20:33 _ikke_ seishun: try git format-patch + git am
20:33 salamanderrake joined #git
20:34 seishun _ikke_: what's the syntax? "git format-patch <commit hash>"?
20:35 kkiero left #git
20:36 jim originally, I had a project, a chord drill, that had a chords dir which had lists of chords to choose from... then I decided to factor chords out because I had another project that wanted to use lists of chords, so I made chords a submodule... now, I'm getting inconsistant results, in one case I get the chord drill project that has a chords dir which is empty... so now, there are two repos, chord-drill-ng and chords, which is a submodule of chord-drill-ng..
20:36 jim any ideas why I'd be getting the inconsistancies and how to fix em?
20:37 jim the addresses of the projects are...
20:37 jim (sec, take me a minute)
20:37 ProbabilityMoon joined #git
20:38 seishun ended up just creating a branch, resetting to the broken commit and resetting author there then cherry-picking the new commit
20:39 _ikke_ jim: Did you initialize + update the submodule?
20:39 jim dunno...
20:40 noobstrap joined #git
20:40 jim https://github.com/jwlynch/chord-drill-ng.git and https://github.com/jwlynch/chords.git
20:41 jim in one of my working dirs, I have -ng with an empty chords dir... do I cd there and init/update?
20:43 jim is a submodule an attribute of the surrounding project?
20:44 hash-z3r_ joined #git
20:44 jim how can I find out if I init/updateed?
20:44 Gustavo6046_ joined #git
20:45 mud joined #git
20:46 Gustavo6046_ joined #git
20:47 enkrypt joined #git
20:48 hudu joined #git
20:53 nowhere_man joined #git
20:54 cdown joined #git
20:54 netj joined #git
20:55 jim I originally split the two into their own repos with filter-branch
20:55 sam_c joined #git
20:59 sz0 joined #git
21:00 venmx joined #git
21:00 navidr joined #git
21:02 BUSY joined #git
21:02 hudu joined #git
21:03 digitalway joined #git
21:04 sondr3 joined #git
21:04 Goplat joined #git
21:08 t-mart joined #git
21:14 mud joined #git
21:16 duderonomy joined #git
21:17 Cabanossi joined #git
21:20 boombatower joined #git
21:20 nixjdm_ joined #git
21:22 n3wborn joined #git
21:23 n3wborn Hi!
21:24 skered joined #git
21:24 n3wborn I'm learning how to use git since some weeks now. I was reading https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration and it shows the "git mergetool --tool-help" command
21:25 n3wborn I did the same, and thought I would use vimdiff before I saw the result of the command
21:25 n3wborn But, I can see there's vimdiff, vimdiff2 and vimdiff3 among other results and my question is :
21:26 n3wborn What is the difference between them ?
21:26 n3wborn and which one could be the best choice for a noob
21:26 n3wborn (if it really matters right now)
21:27 n3wborn (At first, I searched Google how to make better "git commit" as the -m option doesn't really fit my needs, and others as I could guess)
21:27 mud joined #git
21:29 n3wborn So, if someone can give me some good hints, ir would be very appreciated ^^ (for vimdiff or git commit)
21:32 mud joined #git
21:33 shgysk8zer0 joined #git
21:35 kfoonamalik joined #git
21:40 manuelschneid3r joined #git
21:42 nisseni joined #git
21:44 venmx joined #git
21:46 Es0teric joined #git
21:46 mr_sm1th joined #git
21:46 mud joined #git
21:48 gugah joined #git
21:50 nowhere_man joined #git
21:51 EvilPenguin joined #git
21:53 rt joined #git
21:53 n3wborn in fact just "git commit" is what I was looking for, don't know why I always did "git commit -m", but this is how we learn after all
21:54 n3wborn and I think I found what are the differences between the vimdiff commands
21:55 mud joined #git
21:55 n3wborn But, if you still want to help, you can tell me which diff tool you prefer on linux (no troll inside)
21:56 n3wborn If you don't want to, then no problem. Keep coding.
21:57 thiago diff tool or merge tool
21:57 * thiago likes git's diff tool above all others
21:57 thiago in fact, I use it even when I'm not using git
21:58 chachasmooth joined #git
21:58 sarri joined #git
21:58 sarri joined #git
21:58 tunekey joined #git
21:59 n3wborn thanks a lot thiago
22:02 mud joined #git
22:03 webdev007 joined #git
22:03 thiago if you meant merge tool, I like kdiff3
22:04 ZyX-I joined #git
22:06 tymczenko joined #git
22:08 Noldorin joined #git
22:09 hahuang65 joined #git
22:10 TbobbyZ joined #git
22:14 askb joined #git
22:16 worstadmin joined #git
22:16 DuncanT joined #git
22:17 wenzowski joined #git
22:17 ome joined #git
22:18 dmj` joined #git
22:18 kutenai joined #git
22:18 kireevco joined #git
22:18 flupke joined #git
22:19 n3wborn No, I meant diff tool, but thank you anyway
22:19 boxrick1 joined #git
22:20 cttttt joined #git
22:20 anuxivm left #git
22:20 n3wborn knowing what you think about kdiff3 is still useful
22:20 nixjdm_ joined #git
22:20 discopatrick joined #git
22:21 n3wborn Nobody will hurt me if I think meld seems cool too ? ^^ (Noob point of viwe)
22:21 n3wborn *view
22:21 Lyqyd joined #git
22:21 t-richards joined #git
22:21 Domhack joined #git
22:22 dviola joined #git
22:22 Gustavo6046 joined #git
22:23 salamanderrake joined #git
22:25 orbyt_ joined #git
22:26 cebor joined #git
22:26 KnownSyntax joined #git
22:28 chigang__ joined #git
22:29 altendky joined #git
22:29 netj joined #git
22:29 stoopkid_ joined #git
22:29 parliament joined #git
22:29 bronson joined #git
22:29 al-damiri joined #git
22:29 jleclanche joined #git
22:30 Giant81 joined #git
22:32 tnecniv joined #git
22:33 rostero joined #git
22:35 mentazoom joined #git
22:39 om_henners joined #git
22:40 TbobbyZ joined #git
22:44 user2468 joined #git
22:48 Sasazuka joined #git
22:48 Gustavo6046_ joined #git
22:52 venmx joined #git
22:56 raynold joined #git
22:58 hudu joined #git
22:59 TomyLobo joined #git
23:01 Gustavo6046 joined #git
23:05 valhala_22 joined #git
23:10 dave0x6d joined #git
23:11 neunon joined #git
23:15 peepsalot left #git
23:16 rossome joined #git
23:17 Cabanossi joined #git
23:18 rohitpaulk joined #git
23:21 nixjdm_ joined #git
23:22 EvilPenguin joined #git
23:28 acalycine joined #git
23:29 bronson joined #git
23:40 valhala_22 left #git
23:42 xcm joined #git
23:47 Murr joined #git
23:48 stutter joined #git
23:49 jab416171 joined #git
23:51 rohitpaulk joined #git
23:58 Tobbi joined #git
23:58 user2468_ joined #git

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