Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-03

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

All times shown according to UTC.

Time Nick Message
00:00 nd_ joined #git
00:00 d0nn1e joined #git
00:03 Anja joined #git
00:04 JanC_ joined #git
00:05 thiago joined #git
00:05 sssilver joined #git
00:07 renlo joined #git
00:10 converge joined #git
00:10 converge joined #git
00:12 mizu_no_oto joined #git
00:12 Noldorin joined #git
00:12 e14 joined #git
00:15 ome joined #git
00:20 Pyrogerg joined #git
00:21 mischat joined #git
00:22 e14_ joined #git
00:24 jstimm joined #git
00:26 Kaisyu joined #git
00:32 Mobutils joined #git
00:33 Bass10 joined #git
00:37 Bass10 joined #git
00:38 Siegfried joined #git
00:42 snowkidind joined #git
00:43 done joined #git
00:44 refried_ joined #git
00:48 kbs joined #git
00:49 Cavallari joined #git
00:49 Eryn_1983_FL joined #git
00:56 didik joined #git
00:59 crazyadm joined #git
00:59 albel727 joined #git
01:01 slee joined #git
01:03 railssmith joined #git
01:04 shmuli joined #git
01:07 slee_ joined #git
01:07 Guest27874 joined #git
01:12 slee_ left #git
01:12 Pyrogerg joined #git
01:13 slee_ joined #git
01:13 InverseRhombus joined #git
01:15 dodobrain joined #git
01:16 InverseRhombus hey, how would I use git locally? I'm a noob at it
01:16 InverseRhombus just commit without doing the git push command?
01:17 preaction basically, yes
01:17 InverseRhombus preaction, so it's as simple as that?
01:17 preaction yep
01:18 InverseRhombus preaction, cool, thanks
01:19 chachasmooth joined #git
01:21 raijin joined #git
01:23 dodobrain joined #git
01:24 mischat joined #git
01:24 Pie_Napple joined #git
01:25 nettoweb joined #git
01:27 e14 joined #git
01:28 a3Dman_ joined #git
01:30 fstd_ joined #git
01:30 austin987 joined #git
01:36 jgrasser joined #git
01:37 jstimm joined #git
01:38 anuxivm left #git
01:39 MaggieC joined #git
01:39 austin987 joined #git
01:39 nettoweb1 joined #git
01:39 cdown joined #git
01:40 qpdb joined #git
01:40 liuzhen joined #git
01:40 WhiskerBiscuit joined #git
01:42 jaguarmagenta joined #git
01:42 renlo joined #git
01:46 Dougie187 joined #git
01:48 _cyril_ joined #git
01:49 dhollinger joined #git
01:50 shmuli joined #git
01:51 snthsnth joined #git
01:53 drbean joined #git
01:54 Rickmasta joined #git
01:58 matoro joined #git
01:59 sgtbigman joined #git
01:59 bruce_lee joined #git
02:03 Jameser joined #git
02:04 barajasfab joined #git
02:04 harwood joined #git
02:07 mycelium joined #git
02:07 nckpz joined #git
02:08 alex1a joined #git
02:09 finalbeta joined #git
02:10 cqi joined #git
02:10 drbean joined #git
02:11 Goplat joined #git
02:15 nettoweb joined #git
02:16 viper474 joined #git
02:23 e14 joined #git
02:24 renlo joined #git
02:25 mischat joined #git
02:28 slee joined #git
02:30 StatutoryApe joined #git
02:30 stfn joined #git
02:31 dsantiago joined #git
02:32 rchavik joined #git
02:42 e14 joined #git
02:46 msafi joined #git
02:46 _cyril_ joined #git
02:46 austin987 joined #git
02:46 Vampire0_ joined #git
02:46 msafi Is it possible to squash and edit the message of commits of another author?
02:46 msafi (Assuming I have push access to the branch)
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
02:50 thiago msafi: remember it's a history !rewrite
02:50 gitinfo msafi: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
02:50 aavrug joined #git
02:50 mizu_no_oto joined #git
02:51 msafi thiago: thanks for the heads up. I'm doing this before merging to master. All authors are in the loop.
02:52 aavrug joined #git
02:55 mozzarella joined #git
02:55 User458764 joined #git
02:56 mc0e joined #git
02:57 strugee joined #git
03:02 popmystack joined #git
03:03 realz joined #git
03:03 Vaelatern
03:04 jstimm joined #git
03:04 gfixler joined #git
03:06 Pie_Napple joined #git
03:06 toydestroyer joined #git
03:07 msonntag joined #git
03:07 HedgeMage joined #git
03:07 neunon joined #git
03:07 Olipro joined #git
03:07 xehbit joined #git
03:08 dreiss joined #git
03:09 sunri5e joined #git
03:09 shgysk8zer0 joined #git
03:10 _cyril_ joined #git
03:11 minibar joined #git
03:11 crazyadm how to setup git for our php project
03:12 crazyadm is there a tutorial
03:12 preaction what do you mean? you want to host a git server or something?
03:14 whomp joined #git
03:14 Andrew_K joined #git
03:14 crazyadm yes git server
03:14 crazyadm i already compiled and install git latest stable
03:14 preaction you likely want !gitolite
03:14 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
03:15 crazyadm git init?
03:15 preaction no
03:18 Andrew_K joined #git
03:23 Andrew_K joined #git
03:25 mischat joined #git
03:28 mizu_no_oto joined #git
03:31 ome joined #git
03:35 cornjuliox joined #git
03:36 sssilver joined #git
03:38 cornjuliox so ive got like 10+ git repos that I'm working on, and to keep them all up to date I'm having to cd into each directory one-by-one, checkout master, and then git pull. is there a way to automatically keep these repos updated?
03:38 mehola joined #git
03:40 hexagoxel joined #git
03:42 milki cornjuliox: you could script it. why do you need to keep them up to date?
03:42 Shentino joined #git
03:42 cornjuliox they're all under active development by other team members
03:43 milki so that shows the repos are under active development but doesnt really explain why you need your repos up to date
03:43 lagothri1 joined #git
03:44 ochorocho__ joined #git
03:44 milki this sounds like a compulsion rather than a need
03:44 cornjuliox im working on all of them as well?
03:44 milki the beauty of distributed version control means you can work on the repos independently of other people working on the repo
03:45 milki so it doesnt really matter until you actually need other peoples updates
03:45 cornjuliox but see i do need their updates
03:45 cornjuliox often enough to make this an issue
03:46 milki well, you can always make a script and cron it
03:46 thiago you'll have to write a script
03:46 milki but its really rare for someone to need 10 updated repos all the time
03:47 thiago I updated 41 yesterday
03:48 lb1c joined #git
03:48 cdown_ joined #git
03:50 denimsoft joined #git
03:50 mozzarella joined #git
03:55 mehola joined #git
03:56 sssilver joined #git
03:56 sssilver joined #git
03:58 sssilver joined #git
03:58 dreiss joined #git
03:59 crazyadm is there gui for my own git server
03:59 sssilver joined #git
03:59 crazyadm i use gitolite to setup, but i don't know how to use windows to connect to it
04:00 crazyadm i don't even know which one is git server
04:00 renlo joined #git
04:00 crazyadm and i need to get pub key over to server?
04:00 crazyadm im confused
04:00 jost_ joined #git
04:05 chachasmooth joined #git
04:08 atesc joined #git
04:10 GoZoner joined #git
04:11 phanimahesh joined #git
04:14 svm_invictvs joined #git
04:14 Vortex35 joined #git
04:15 kyan joined #git
04:17 safe joined #git
04:20 acetakwas joined #git
04:22 kriskropd joined #git
04:24 joki joined #git
04:26 mischat joined #git
04:27 dreiss joined #git
04:28 SwiftMatt joined #git
04:29 denimsoft joined #git
04:30 mc0e joined #git
04:33 dreiss joined #git
04:40 sdothum joined #git
04:40 jaguarmagenta joined #git
04:42 hafeez3000 joined #git
04:43 subhojit777 joined #git
04:46 hafeez3000_ joined #git
04:46 ngrin joined #git
04:49 liuzhen joined #git
04:49 zacts joined #git
04:50 bannakaffalatta joined #git
04:52 lindenle joined #git
04:53 lindenle joined #git
04:54 lindenle joined #git
04:54 shmuli joined #git
04:56 bmahe joined #git
04:56 arescorpio joined #git
04:56 mischat joined #git
04:56 akushner joined #git
04:57 sssilver joined #git
05:01 hahuang61 joined #git
05:02 dreiss joined #git
05:03 mischat joined #git
05:04 didik joined #git
05:04 mischat joined #git
05:05 mischat joined #git
05:05 nivag joined #git
05:06 mischat joined #git
05:08 qws-user-1228 joined #git
05:08 jfr joined #git
05:09 O47m341 joined #git
05:10 rscata joined #git
05:15 jaguarmagenta joined #git
05:18 scarabx joined #git
05:18 shpew12 joined #git
05:18 ayjay_t joined #git
05:19 sdothum joined #git
05:24 ochorocho__ joined #git
05:25 liuzhen joined #git
05:25 Siegfried joined #git
05:28 cqi joined #git
05:30 oskarkv joined #git
05:36 Cabanossi joined #git
05:50 pigeon joined #git
05:51 resurtm joined #git
05:52 ochorocho__ joined #git
05:52 shmuli joined #git
05:53 shmuli joined #git
05:54 mc0e left #git
05:56 shmuli joined #git
05:58 shmuli joined #git
06:01 shmuli joined #git
06:01 darkbit joined #git
06:01 didik1 joined #git
06:03 nilg joined #git
06:03 hahuang61 joined #git
06:06 qt-x joined #git
06:06 mischat joined #git
06:17 nawwmz joined #git
06:20 rkazak joined #git
06:22 zulutango joined #git
06:26 ngperfex joined #git
06:30 mozzarella joined #git
06:32 didik joined #git
06:34 dreiss joined #git
06:40 shpew12 joined #git
06:40 mrpackethead joined #git
06:40 PCatinean joined #git
06:43 zumba_addict joined #git
06:45 dodobrain joined #git
06:53 shmuli joined #git
06:54 lordjancso joined #git
06:58 ISmithers joined #git
06:59 Raging_Hog joined #git
07:00 ducksama joined #git
07:01 User458764 joined #git
07:02 User458764 joined #git
07:03 MrMojito joined #git
07:03 MrMojito joined #git
07:04 hahuang61 joined #git
07:04 LucaTM joined #git
07:06 clemf joined #git
07:06 mischat joined #git
07:09 Jameser joined #git
07:11 liuzhen_ joined #git
07:11 bocaneri joined #git
07:12 MrWoohoo joined #git
07:13 meauses joined #git
07:14 h- joined #git
07:16 mattcen joined #git
07:18 BSAlb joined #git
07:20 sssilver joined #git
07:21 freimatz joined #git
07:23 phanimahesh joined #git
07:24 InfoTest1 joined #git
07:26 laumann joined #git
07:27 nidr0x joined #git
07:29 brk_ joined #git
07:31 overlord_tm joined #git
07:31 t0by joined #git
07:32 knittl could it be that git am is really broken on windows?
07:32 knittl iow not working
07:32 grawity it could be
07:32 grawity there's a chance of any given program being broken
07:32 knittl I'm pretty sure the file I want to apply the patches to is 100 % identical to the one where I created the patches
07:32 grawity is it not working for you specifically?
07:33 knittl still, am (apply?) fails with "error: while searching for:"
07:33 pokalyis joined #git
07:33 Sceorem joined #git
07:33 knittl I assume it's whitespace crlf/lf troubles
07:35 knittl just a guess: it does strip
07:35 knittl * it does strip ^M from patch files, but then fails if the file to apply the patch contains the carriage return
07:36 terens_ joined #git
07:37 knittl jup. pretty much looks like it. duplicating the
07:38 knittl ^M char at EOL makes it work
07:38 knittl "14 lines add whitespace errors." – but I guess that's just the unexpected ^M at eol (because Git expects only LF)
07:39 Seveas knittl: --keep-cr
07:40 Seveas or git config am.keepcr true
07:40 knittl Seveas: aaah
07:40 knittl nice
07:40 knittl well, now I did a little sed-magic
07:40 Seveas never a bad idea to practice your sed skills
07:41 knittl although. It did not work. It removed the CRs
07:41 knittl tsts
07:41 knittl it probably does crlf/lf normalization too
07:42 knittl Seveas: keep-cr did the trick. thanks!!
07:44 ahmedelgabri joined #git
07:47 elect joined #git
07:47 jnavila joined #git
07:57 qpdb joined #git
08:02 zeroed joined #git
08:02 zeroed joined #git
08:02 rasto joined #git
08:02 renlo joined #git
08:03 Darcidride joined #git
08:04 danslo joined #git
08:04 zeroed joined #git
08:04 zeroed joined #git
08:05 danslo joined #git
08:05 hahuang61 joined #git
08:07 zeroed joined #git
08:10 zeroed joined #git
08:11 eduardas_m joined #git
08:12 fees joined #git
08:12 dsdeiz joined #git
08:13 TomyWork joined #git
08:13 danslo joined #git
08:14 buzzLightBeer joined #git
08:14 Balliad joined #git
08:18 a3Dman joined #git
08:21 [twistii] joined #git
08:25 acetakwas joined #git
08:28 xall joined #git
08:28 Jameser joined #git
08:31 GavinMagnus joined #git
08:34 tvw joined #git
08:34 ferr joined #git
08:40 laumann joined #git
08:41 finalbeta joined #git
08:42 User458764 joined #git
08:45 stuh84 joined #git
08:47 GavinMagnus1 joined #git
08:47 nettoweb joined #git
08:48 systemovich joined #git
08:48 djb-irc joined #git
08:51 ciechomke joined #git
08:51 halbomin joined #git
08:53 kurkale6ka joined #git
08:53 GavinMagnus1 left #git
08:56 djb-irc joined #git
08:57 clmsy joined #git
08:58 snthsnth joined #git
08:59 skyres joined #git
09:00 mikecmpbll joined #git
09:01 jottr joined #git
09:03 tjone270_ joined #git
09:03 marcogmonteiro joined #git
09:07 sssilver joined #git
09:07 pbrewczynski joined #git
09:09 masuberu joined #git
09:10 _ng joined #git
09:10 alcohol joined #git
09:12 jknetl joined #git
09:14 howdoi joined #git
09:16 bl0w3d_0ut joined #git
09:17 djb-irc joined #git
09:18 a3Dman joined #git
09:18 mauzilla joined #git
09:19 [ADN] joined #git
09:19 mauzilla bit of a noob moment but I wanted to check out a single file from a previous commit but then did a checkout on the entire project, is there a way for me to revert the checkout?
09:20 grawity did you check out just all files, or the entire commit?
09:20 grawity either way `git checkout master` will probably do
09:20 selckin !detached
09:20 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:21 jknetl joined #git
09:22 done joined #git
09:22 mauzilla thanks grawity, let me try that out quick
09:23 Repox joined #git
09:23 NeverDie joined #git
09:24 encod3 joined #git
09:26 dviola joined #git
09:26 hariel joined #git
09:26 acetakwas joined #git
09:29 robotroll joined #git
09:30 brillenfux joined #git
09:31 mikecmpbll joined #git
09:31 lindenle joined #git
09:32 jfelchner joined #git
09:37 a3Dman joined #git
09:46 chid joined #git
09:47 mischat joined #git
09:49 _noblegas joined #git
09:53 liuzhen joined #git
09:53 InfoTest joined #git
09:54 yahoo123 joined #git
09:54 yahoo123 left #git
09:57 ethanol joined #git
09:58 elastix joined #git
10:01 rnsanchez joined #git
10:02 alcohol joined #git
10:05 King_Hual joined #git
10:06 Serpent7776 joined #git
10:06 mattcen joined #git
10:07 inflames joined #git
10:08 User458764 joined #git
10:08 User458764 joined #git
10:09 corsibu joined #git
10:10 PCatinean How does one delete all remote branches except one?
10:11 selckin with some shell scripting or copy pasting
10:11 flavius joined #git
10:12 corsibu joined #git
10:14 rapha joined #git
10:16 hplar joined #git
10:17 pokalyis joined #git
10:18 inflames joined #git
10:18 jcalonso joined #git
10:20 delboy1978uk joined #git
10:21 delboy1978uk i deleted a branchg locally, and re-checked it out. but there are still untracked working tree files? i did a reset too! how do i get rid of these files?!
10:22 selckin git clean -df
10:22 tobiasvl delboy1978uk: untracked changes !float and don't belong to any branch
10:22 gitinfo delboy1978uk: 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.
10:23 mattcen joined #git
10:25 delboy1978uk thanks guys
10:25 Endarked joined #git
10:27 Siegfried joined #git
10:28 Xethron joined #git
10:31 xall joined #git
10:33 afuentes joined #git
10:34 pokalyis joined #git
10:39 terens_ left #git
10:40 tvw joined #git
10:40 acetakwas joined #git
10:45 Neon joined #git
10:45 chele joined #git
10:46 tvw joined #git
10:46 Neon I accidentally made a big merge to my master. To undo, I reset --hard to the commit before the merge commit. After that I realized that the merge introduced multiple commits. Now I'm trying to find a quick way out of this.
10:48 tobiasvl Neon: what do you mean? resetting to the commit before the merge commit should suffice – as long as you picked the correct (mainline) parent commit of course
10:48 selckin !undo
10:48 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
10:48 selckin !reflog
10:48 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
10:48 Neon tobiasvl: That would be the problem then. I accidentally picked the lst commit of the branch I merged into master.
10:49 selckin reset again to the correct commit
10:49 pokalyis joined #git
10:49 Neon Oh, yeah, there it is. I didn't think about that. Probably because I haven't used the reflog much yet.
10:50 edeca_ joined #git
10:50 Neon selckin: Thanks for that hint.
10:51 ngperfex joined #git
10:51 edeca_ left #git
10:51 edeca joined #git
10:51 edeca Is there a way to tell git never to fall back to password auth?  My SSH key is on a smart card, if that's not present I'd rather background repository checks fail than popup a password prompt (I'm using a gui client)
10:52 selckin what ssh client?
10:52 ieee joined #git
10:52 selckin you can configure openssh not to do password auth per host in ~/.ssh/config
10:55 edeca selckin: Good question, this is actually using Sourcetree on Windows.  I will see about the SSH config there, thanks!
10:56 GavinMagnus joined #git
10:57 aswen joined #git
10:58 hahuang61 joined #git
10:58 ieee joined #git
11:01 grawity I checked PuTTY's configs, it doesn't let you disable password auth :/
11:02 selckin use bash for windows :)
11:03 phanimahesh joined #git
11:04 Timvde joined #git
11:04 jcalonso joined #git
11:04 TheWild joined #git
11:05 jcalonso joined #git
11:06 pokalyis joined #git
11:06 TheWild hello. I encountered a problem. After git pull I would like to tell "I don't care what was on the server. I want my code back!" but there's no git stash pop --force.
11:07 tobiasvl TheWild: I don't quite understand – you can just pop the stash regularly and it will be applied. what would --force do in that instance?
11:08 tobiasvl the stash is just like a commit, it's just a diff, it doesn't hold the state of the entire repo at the time you stashed
11:08 selckin resolve the conflicts to whats in stash i guess
11:08 tobiasvl TheWild: do you want to undo the merge?
11:09 brk_ joined #git
11:09 selckin !reflog
11:09 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
11:11 tobiasvl TheWild: you can also reset to ORIG_HEAD, which contains the old HEAD from before the merge. but I'm not sure how the stash enters the equation here
11:11 tobiasvl so please explain in a bit more detail what you wish to achieve
11:15 finalbeta joined #git
11:15 ArchNoob joined #git
11:16 rapha guys, i'm sorry to keep bothering you with this ... is there any way to keep git from doing really expensive operations when trying to add/commit/push just a subdir of the working tree? i'm somewhere beyond 300000 files now (and probably around as many directories) and even just committing a single file in the root dir takes hours :(
11:16 delboy1978uk left #git
11:17 rapha (already doing "git commit -uno" for everything)
11:22 TheWild I'm sorry for inconvenience. I finally managed to put things on the right track. git checkout --ours . did the job.
11:22 fmcgeough joined #git
11:23 pokalyis joined #git
11:26 tobiasvl ah, you were in a merge
11:26 tobiasvl no worries
11:29 barteks2x joined #git
11:30 finalbeta joined #git
11:33 cagedwisdom joined #git
11:34 qpdb joined #git
11:35 User458764 joined #git
11:35 rominronin joined #git
11:36 jozwior joined #git
11:38 ocbtec joined #git
11:40 pokalyis joined #git
11:44 Xethron joined #git
11:46 Jameser joined #git
11:53 Jameser_ joined #git
11:57 pokalyis joined #git
11:59 hahuang61 joined #git
11:59 synthroid joined #git
11:59 ochorocho__ joined #git
12:03 User458764 joined #git
12:04 mrpacket_ joined #git
12:04 jcalonso joined #git
12:06 jcalonso joined #git
12:07 johnmilton joined #git
12:07 mizu_no_oto joined #git
12:08 interrobangd joined #git
12:09 jcalonso joined #git
12:13 [twistii] joined #git
12:13 Darcidride_ joined #git
12:15 pokalyis joined #git
12:16 jottr joined #git
12:18 jeffreylevesque joined #git
12:20 jozwior joined #git
12:21 buzzLightBeer joined #git
12:23 User458764 joined #git
12:24 User458764 joined #git
12:24 Raed joined #git
12:24 User458764 joined #git
12:26 zeroed joined #git
12:27 AndrewAlexMac joined #git
12:29 pokalyis joined #git
12:29 Xethron joined #git
12:32 d0n0x joined #git
12:33 courrier joined #git
12:33 Xethron_ joined #git
12:33 liamonade joined #git
12:34 phanimahesh joined #git
12:34 Orphis joined #git
12:35 skunkz joined #git
12:38 liuzhen joined #git
12:38 rbern joined #git
12:39 fmcgeough joined #git
12:40 nfk joined #git
12:41 shiriru joined #git
12:45 troulouliou_div2 joined #git
12:46 pokalyis joined #git
12:47 shinnya joined #git
12:47 xall joined #git
12:48 sdothum joined #git
12:50 joki joined #git
12:51 jbitdrop joined #git
12:52 notebox joined #git
12:53 meth joined #git
12:55 liuzhen joined #git
13:00 hahuang61 joined #git
13:00 mark_66 joined #git
13:00 zivester joined #git
13:01 rapha for the record, this is a really interesting thread: http://stackoverflow.com/questions/984707/what-are-the-file-limits-in-git-number-and-size
13:04 TomyWork joined #git
13:04 barteks2x joined #git
13:04 pokalyis joined #git
13:05 Gloomy joined #git
13:05 ramsub07 joined #git
13:08 ToBeCloud joined #git
13:08 ExoUNX joined #git
13:09 crazyhorse18 joined #git
13:09 Sound joined #git
13:09 cdg joined #git
13:11 meth joined #git
13:12 useless_person joined #git
13:13 Benz000 joined #git
13:14 grumble joined #git
13:15 mischat joined #git
13:15 jaafar joined #git
13:15 mischat joined #git
13:16 Raging_Hog joined #git
13:16 useless_person left #git
13:18 slee_ joined #git
13:20 pokalyis joined #git
13:23 Xucc joined #git
13:25 subhojit777 joined #git
13:25 Gsham joined #git
13:29 breakerz joined #git
13:30 UTAN_dev joined #git
13:34 liamonade joined #git
13:35 barteks2x joined #git
13:36 rorro joined #git
13:36 pokalyis joined #git
13:37 aviraldg joined #git
13:37 aviraldg joined #git
13:37 barteks2x joined #git
13:38 User458764 joined #git
13:38 liamonade joined #git
13:43 bannakaffalatta joined #git
13:44 d0n0x joined #git
13:44 TheWild I may not be at the office tommorow but I would like to take my unfinished changes with me so I can continue working on it at home, but without commiting (because unfinished) and without copying whole reposiroty (because it's big and for security reasons). I have access to the repository server from my home. Is there a way to create a diff at office so I can apply it at home?
13:44 red82 joined #git
13:45 tobiasvl TheWild: you don't have access to your office computer from home?
13:45 TheWild nope
13:46 tobiasvl can you commit your unfinished stuff and push it to your own branch to the repository server?
13:46 tobiasvl otherwise, you can make a diff, yes. or just zip up and take the entire repo home with you if that's feasible.
13:46 grawity commit stuff, git bundle it
13:46 grawity at home, git pull from the bundle file
13:47 TheWild yikes, why I didn't think of that? Yes, I can create my own branches.
13:47 TheWild that's the way to go. Tbanks, tobiasvl
13:47 Es0teric joined #git
13:48 roelmonnens joined #git
13:48 ionelmanolache joined #git
13:50 a_thakur joined #git
13:51 XuCC joined #git
13:52 sorenb_ joined #git
13:53 Vampire0 TheWild, or commit, then use man git format-patch and at home man git am
13:53 gitinfo TheWild: the git-format-patch manpage is available at http://jk.gs/git-format-patch.html
13:53 gitinfo TheWild: the git-am manpage is available at http://jk.gs/git-am.html
13:54 Dougie187 joined #git
13:54 Darcidride joined #git
13:55 aswen0 joined #git
13:55 pokalyis joined #git
13:55 OliverJAsh joined #git
13:56 XuCC joined #git
13:56 OliverJAsh In `git add --patch`, you can go to previous/next hunks, which is useful when you accidentally select/reject a hunk and need to undo it. However, previous/next doesn't seem to work when the previous/next is in a different file. Is there any reason for this behaviour, and any way around it?
13:57 berndl joined #git
13:59 UTAN_dev joined #git
14:00 LionsMane joined #git
14:01 hahuang61 joined #git
14:02 AaronMT joined #git
14:03 Es0teric joined #git
14:04 Ploppz joined #git
14:04 ayjay_t joined #git
14:06 boombatower joined #git
14:07 saml joined #git
14:09 hashpuppy joined #git
14:09 ResidentBiscuit joined #git
14:10 pokalyis joined #git
14:10 Rodya_ joined #git
14:11 pdgwien joined #git
14:15 converge joined #git
14:15 converge joined #git
14:16 encod3 joined #git
14:17 bannakaffalatta joined #git
14:18 rmbeer joined #git
14:20 crose joined #git
14:20 mkoskar joined #git
14:21 Es0teric joined #git
14:22 eduardas_m joined #git
14:23 t4nk339 joined #git
14:23 nawwmz joined #git
14:23 mischat joined #git
14:24 fission6 joined #git
14:25 fission6 i just commited to a feature branch, i wanted that commitment on master, what do i do
14:25 _ikke_ cherry-pick the commit on master, then reset the feature branch one commit back
14:26 lindenle joined #git
14:26 Dougie187 Or, if the feature branch is just one ahead of master, fast-forward master.
14:26 Dougie187 Depends a lot on what the history looks like.
14:26 Starky joined #git
14:27 fission6 _ikke_: i think your approach makes sense here
14:27 fission6 what am i technically looking to do here
14:27 fission6 this is the commit hash from the feature branch, its the most recent commit
14:27 fission6 9edfffd315f63
14:28 Dougie187 `git checkout master; git cherry-pick 9edfffd315f63; git checkout <feature>; git reset --hard HEAD^`
14:28 fission6 ahhhh
14:28 fission6 cool let me try!
14:28 dreamer left #git
14:28 johnmilton joined #git
14:29 ArchNoob joined #git
14:31 Noldorin joined #git
14:31 _ikke_ note that reset --hard will also undo any change to tracked files
14:32 _ikke_ we usually advise to use --keep when you don't explicitly want to undo those
14:36 achadwick joined #git
14:36 al-damiri joined #git
14:36 noidea joined #git
14:36 noidea joined #git
14:37 diogenese joined #git
14:37 crazyadm joined #git
14:40 SteffanW joined #git
14:43 nckpz joined #git
14:47 SourTrout joined #git
14:48 SourTrout joined #git
14:50 gareppa joined #git
14:52 IrishPrime joined #git
14:52 gareppa joined #git
14:56 matsaman joined #git
14:57 nyuszika7h_ joined #git
14:57 Es0teric joined #git
14:57 Darren_ joined #git
14:58 e14 joined #git
14:58 ShekharReddy joined #git
14:59 atesc joined #git
15:00 Es0teric joined #git
15:01 jstimm joined #git
15:01 ochorocho__ joined #git
15:02 hahuang61 joined #git
15:02 Achylles joined #git
15:03 phaleth joined #git
15:06 matsaman joined #git
15:06 arand___ joined #git
15:06 sangy joined #git
15:06 cdown joined #git
15:08 arand___ Is there any way to filter a diff to only show submodule differences? Or do I need to parse ls-tree first to get the modules and them pass those paths to diff?
15:08 EricPoe joined #git
15:09 matsaman submodule?
15:11 BSaboia joined #git
15:12 Es0teric joined #git
15:12 kpease joined #git
15:12 zivester joined #git
15:13 VagabondAzulien joined #git
15:13 kpease_ joined #git
15:14 clemf joined #git
15:15 jeremyhall joined #git
15:15 EricPoe joined #git
15:15 meth joined #git
15:15 arand___ Hmm, I guess this does it: start=v0.6.2; { git ls-tree -r HEAD; git ls-tree $start; } | grep "^160000" | cut -d'   ' -f2 | xargs git diff $start HEAD --submodule --
15:16 dreiss joined #git
15:17 ayjay_t joined #git
15:20 Olipro joined #git
15:20 x0rs joined #git
15:22 XuCC joined #git
15:23 ramsub07 joined #git
15:23 robattila256 joined #git
15:25 skunkz joined #git
15:26 manuels joined #git
15:27 GoZoner joined #git
15:27 gareppa joined #git
15:30 ionelman_ joined #git
15:30 converge joined #git
15:30 ionelman_ joined #git
15:31 eivarv joined #git
15:32 madewokherd joined #git
15:32 crazyadm joined #git
15:32 tyreld joined #git
15:33 _Patrick_ joined #git
15:34 akushner joined #git
15:38 ionelmanolache joined #git
15:39 Endarked joined #git
15:39 pks joined #git
15:40 Learath2 joined #git
15:40 Mattias left #git
15:40 XuCC joined #git
15:42 Seveas arand___: maybe something with git submodule foreach?
15:42 ramsub07 Hello how do I check the commits that hasn't been pushed ? I have appended to a commit. I want to know if the recent update has been pushed or not..?
15:43 Seveas ramsub07: git log @{u}.. or !lol
15:43 gitinfo ramsub07: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:46 nicksloan joined #git
15:46 arand___ Seveas: Yea, but then I need to inject the begin and end commit for each module, which is even more clunky, I have done a recursive diff implementation, and ended up even more complex.
15:47 nicksloan is there any recourse for making merging a bit easier when git diff gets confused about which sections of a file map to which
15:47 crayon joined #git
15:48 crazyadm joined #git
15:48 Seveas making smaller commits
15:49 nicksloan Seveas: yeah, I'm merging someone else's work, so that ship has already sailed.
15:50 nicksloan though in the future I'll encourage that
15:50 aarobc joined #git
15:50 shmuli joined #git
15:51 Electrometro joined #git
15:52 ruby_ joined #git
15:52 ionelman_ joined #git
15:52 dviola joined #git
15:53 Electrometro joined #git
15:53 PHPanos joined #git
15:53 PHPanos hello
15:54 PHPanos If I push a new remote branch with git push -u origin newbranch
15:54 Seveas nicksloan: you can ask that other person to do some commit grooming and give you something that's easier to merge
15:56 PHPanos If I push a new remote branch with git push -u origin newbranch from my local branch newbranch, next time I do git push, will I push to master or my new branch? I suppose master right?
15:56 Seveas master
15:57 davidfetter_ge joined #git
15:57 Seveas unless you're still on newbranch, then newbranch
15:58 selckin you push to the remote trackign branch of the current one
15:58 Seveas to see what a branch will push to, git rev-parse --symbolic-full-name --abbrev-ref master@{upstream}
15:58 selckin -u updates that
15:58 Seveas replace master with the name of the branch
15:58 selckin so not master
15:58 Seveas or leave it out to see what the current branch would push to
15:59 Seveas hurricane:~/code/git (master=)$ git rev-parse --symbolic-full-name --abbrev-ref master@{upstream}
15:59 Seveas origin/master
15:59 Seveas hurricane:~/code/git (master=)$ git rev-parse --symbolic-full-name --abbrev-ref next@{upstream}
15:59 Seveas upstream/next
15:59 Seveas hurricane:~/code/git (master=)$ git rev-parse --symbolic-full-name --abbrev-ref @{upstream}
15:59 Seveas origin/master
15:59 zacts joined #git
16:00 Balthasar|HPWork joined #git
16:00 flavius joined #git
16:02 elementalest joined #git
16:02 hahuang61 joined #git
16:03 roelmonn_ joined #git
16:03 Vampire0_ joined #git
16:05 mischat_ joined #git
16:06 d0nn1e joined #git
16:07 Rodya_ joined #git
16:08 renlo joined #git
16:09 ojdo joined #git
16:10 PHPanos Seveas selckin Sorry had to fix some stuff. Yeah so if i'm on the newbranch locally, I will push to newbranch if I did a git push -u origin newbranch. Thanks!
16:11 jstimm joined #git
16:11 jeffreylevesque_ joined #git
16:11 gho5t joined #git
16:13 soerenb joined #git
16:14 ionelmanolache joined #git
16:17 _cyril_ joined #git
16:19 jstimm joined #git
16:19 sssilver joined #git
16:19 alex1a joined #git
16:22 chitopunk joined #git
16:22 Balthasar|HPWork joined #git
16:22 ProbabilityMoon joined #git
16:22 durham joined #git
16:25 User458764 joined #git
16:26 ftoulemon joined #git
16:27 XuCC joined #git
16:27 King_Hual joined #git
16:28 eivarv joined #git
16:29 nitric joined #git
16:31 Balthasar|V20 joined #git
16:33 royger joined #git
16:33 Domhack joined #git
16:34 royger does someone know where stgit stores it's metadata? Not sure why, but I've managed to create a patch with a '/' in it's name and now stgit doesn't let me push/pop or even delete it.
16:36 jccn joined #git
16:38 svm_invictvs joined #git
16:40 renlo joined #git
16:40 UTAN_dev joined #git
16:40 courrier_ joined #git
16:40 Ploppz joined #git
16:44 User458764 joined #git
16:45 ochorocho__ joined #git
16:45 austin987 joined #git
16:46 royger left #git
16:46 rbern joined #git
16:47 Filiphe joined #git
16:48 Es0teric joined #git
16:48 darkbit joined #git
16:50 cdown joined #git
16:51 steven_a_s joined #git
16:52 zumba_ad_ joined #git
16:55 nezZario joined #git
16:56 emg anyone here happen to use s-nail or heirloom mailx and able to git am after receiving a patch? (I tried save, looked like way too many headers, git am failed. git mailinfo split it correctly though...)
16:57 Motoko joined #git
16:57 LarArT joined #git
16:57 helium-3 joined #git
16:58 zumba_ad_ joined #git
16:59 oskarkv joined #git
17:00 e14 joined #git
17:00 nicksloan joined #git
17:01 acetakwas joined #git
17:03 encod3 joined #git
17:03 jjasinski joined #git
17:07 pijiu joined #git
17:08 kyan joined #git
17:11 stupid_person joined #git
17:11 stupid_person joined #git
17:11 navidr joined #git
17:13 rmbeer hello
17:13 kruncher joined #git
17:14 kruncher Hi; if I have a local repo; how can I create a clone of a specific tag or commit into a completely new local folder?
17:14 rmbeer i have a tag in one side and a snapshot in other side, how to mix the two? i need specific that a commit have a tag
17:15 rmbeer i use this: git -a [tag] [hash]
17:15 rmbeer but this say that tag have exist and can't create
17:16 aard_ joined #git
17:16 kruncher rmbeer, are you trying to remove an existing tag?
17:16 sssilver joined #git
17:17 rmbeer kruncher, no, i create the new proyect of git, and need add 1 snapshot/commit all and add tag
17:17 xehbit joined #git
17:17 rmbeer project*
17:17 NeverDie joined #git
17:17 kruncher is the tag already being used in the repo though?
17:18 rmbeer kruncher, yes, i have it. show with "git tag"
17:19 kruncher You can't have 2 tags with the same name. So if you want to tag a later commit with the same tag; you would need to either a) remove the original tag first, or b) use a different name for your newer tag
17:19 rmbeer use the "git tag -a [tag]" for create. and now want apply in other commits
17:19 rbr joined #git
17:20 VagabondAzulien joined #git
17:21 rmbeer kruncher, not understand. when must use the tag? i use tag for setting the version of code. the tag apply for each commit or a group of commit?
17:21 kruncher a tag marks a single commit
17:21 rmbeer then for each commit have a different tag?
17:22 f4 joined #git
17:22 kruncher If you have 5 separate commits that belong to v1.0.0 then you only need to tag the last commit
17:23 ayjay_t joined #git
17:23 kruncher rmbeer, for example
17:24 CubiK joined #git
17:24 JamesBaxter joined #git
17:24 kruncher if you checkout the commit tagged "v1.0.0" then you would get everything before and including the tagged commit. So if you want to do a build of a specific version, say v1.0.0 , then you just checkout v1.0.0 and then run your build process. v1.0.1 would allow you to build a newer version.
17:24 Anja joined #git
17:25 nicksloan joined #git
17:25 kadoban joined #git
17:26 re1 joined #git
17:26 rmbeer then where i create a new commit for the same version of the last commit, i must remove the tag of the last commit and create again in the new commit?
17:27 kruncher you shouldn't be "moving" tags each time you commit
17:27 Vampire0_ joined #git
17:27 kruncher Only tag a commit when that version is released
17:27 nhennenfent joined #git
17:28 rmbeer i have like this: commit A, commit B, commit C. have the tag v1.0 in the commit C and i want add commit D with the same version, remove the tag v1.0 and create again v1.0 for commit D?
17:28 kruncher I would highly recommend looking into the git-flow process
17:29 kruncher rmbeer; do all of your commits and then when you are ready to commit to a release `git tag v1.0.0` If you have to make any further commits after that then it's a new release. i.e. v1.0.1
17:29 kruncher you might also want to look at http://semver.org/
17:30 ArchNoob joined #git
17:30 kruncher you don't want to be tagging every single commit
17:31 rmbeer i see, then i really must be sure for add a tag in a commit?
17:31 algun joined #git
17:31 kruncher rmbeer i'm not understanding your question
17:31 rmbeer if setting a tag in a commit, is in this last commit that have this version of tag.
17:32 rmbeer the next commits is a beta testing
17:32 kruncher when you are ready to release; stamp the last commit of that release with a tag
17:32 kruncher if you have parallel releases then you should be using branches
17:33 converge joined #git
17:33 converge joined #git
17:33 rmbeer ok thank, now understand.
17:34 railssmith joined #git
17:34 strugee joined #git
17:34 Doginal joined #git
17:34 kruncher rmbeer, check this out: https://www.youtube.com/watch?v=6LhTe8Mz6jM
17:36 alhariel joined #git
17:38 vuoto joined #git
17:43 chris123456 joined #git
17:43 fission6 joined #git
17:45 relipse joined #git
17:45 relipse if i do git fetch and master was updated, how do i take my current branch and get masters changes into them?
17:46 rmbeer i use a "git init", "git add ." and "git commit" for create the first version of code. but how to add the next tree directory of code like a new version?
17:46 kruncher relipse, sounds like you want to merge?
17:46 relipse kruncher how do I merge master into my branch?
17:46 relipse i'm used to doing "git rebase master"
17:47 relipse but that was frowned upon
17:47 chris2 joined #git
17:47 kruncher relipse, normally "git pull" should be enough
17:48 e joined #git
17:48 kruncher rebasing isn't a great idea
17:48 kruncher only rebase local changes
17:49 kruncher otherwise your team mates will probably get frustrated ^_^
17:49 rapha joined #git
17:49 relipse ok I did git pull but how do i know if master is merged into my branch i'm on?
17:49 jeffreylevesque_ joined #git
17:49 User458764 joined #git
17:49 Skryll joined #git
17:50 thiago joined #git
17:50 kruncher if you show the log then you should see the new commits from master on your local copy
17:50 cdown joined #git
17:50 Benz000 left #git
17:51 kruncher relipse, are you working on master or your own branch?
17:51 relipse my own branch and master was just updated
17:51 relipse so i need to get master's changes into my branch
17:51 kruncher okay, so you are wanting to pull latest version of master, and then merge master into your branch
17:51 laumann joined #git
17:51 relipse ok i already did git pull , how do i "merge master into my branch"
17:52 VagabondAzulien_ joined #git
17:52 Achylles joined #git
17:52 kruncher git merge master
17:52 relipse oh
17:52 kruncher if there are conflicts then you will obviously need to fix those
17:53 relipse ok It said "Already up-to-date"
17:54 jcalonso joined #git
17:54 kruncher are you on your branch?
17:54 nhuo joined #git
17:54 relipse yes
17:55 kruncher okay, so it sounds like the master is already merged into your branch
17:55 dsantiago joined #git
17:58 rmbeer for understand best. the work directory is the same where have the .git?
17:59 akushner joined #git
18:00 Sasazuka joined #git
18:00 LucaTM joined #git
18:01 synthroid joined #git
18:02 resurtm joined #git
18:03 GavinMagnus left #git
18:03 hahuang61 joined #git
18:05 Es0teric joined #git
18:05 Cavallari joined #git
18:08 sammyo joined #git
18:08 rapha joined #git
18:08 rapha joined #git
18:10 rmbeer i have the something directory of source code copy where the project advanced. The problem is that unknown how to merge or mixed the next directory to main repo of git.
18:11 synthroid joined #git
18:13 resurtm2 joined #git
18:13 rmbeer how to add this each directory in the master of git for save the each version? i simply erase all files/directorys (without .git) and copy the content of the next version?
18:15 Maple__ joined #git
18:15 Maple__ joined #git
18:15 Maple__ joined #git
18:15 madewokherd joined #git
18:18 ExoUNX joined #git
18:18 ArchNoob joined #git
18:19 dsantiag_ joined #git
18:23 ShekharReddy joined #git
18:23 kenden joined #git
18:24 kenden_ joined #git
18:25 e14 joined #git
18:26 rbr joined #git
18:28 renlo hey whats a default 'git attribute filter' ?
18:28 renlo I have git lfs tracking a directory (some/dir/*), but I want it to NOT track a single file
18:30 rkazak joined #git
18:30 sea-gull_ joined #git
18:31 mniip joined #git
18:34 renlo I just want git lfs to stop tracking the damned thing
18:34 renlo I cant find this anywhere
18:36 xo_odin joined #git
18:36 jcalonso joined #git
18:38 Domhack joined #git
18:39 whomp joined #git
18:40 doener joined #git
18:41 resurtm joined #git
18:45 VagabondAzulien joined #git
18:46 m0viefreak joined #git
18:47 BPL joined #git
18:48 ejb joined #git
18:48 BPL Hi everyone, I've tried this little snippet http://stackoverflow.com/a/9076361/3809375 to pull all branches and it works with all of them minus the current one, any easy fix?
18:49 cagedwisdom joined #git
18:49 ayjay2 joined #git
18:49 joco42 joined #git
18:50 bannakaffalatta joined #git
18:51 corsibu joined #git
18:52 Jackneill joined #git
18:52 Jackneill hey
18:52 nwkj86 joined #git
18:53 Groscheri joined #git
18:53 jstimm joined #git
18:53 Jackneill i cloned a repo, modified/added files. but i dont want this change to be in master (i accidentally didnt create a new branch for it). how can i move my changes from master to a new branch? (from the cloning point)
18:54 phil22 joined #git
18:55 ojacobson joined #git
18:55 chris123456 Jackneill: Did you commit the changes you made?
18:55 Jackneill chris123456, no
18:55 Jackneill i didnt do anything with git yet
18:55 ayjay_t joined #git
18:56 Doginal_ joined #git
18:56 Jackneill should i just create a new branch now, go back to master and then reset?
18:56 chris123456 If I understand correctly, you can just go "git stash save", "git checkout -b new_branch", "git stash pop" and you will have the changes on your new branch
18:56 Jackneill i see, thanks
18:59 Jackneill chris123456, now i have the changes on both branches
19:00 Jackneill so i guess i need a git reset HEAD on master?
19:00 ayjay_t joined #git
19:01 jottr joined #git
19:01 chris123456 I'm a bit confused, maybe I misunderstood. If you made changes, you shouldn't have been able to create a new branch without committing or stashing
19:01 chris123456 So you stashed your changes, which should have reverted your master branch to the pre change state
19:01 kruncher Is there a way to run `git clone . ../RepoAtV1 --depth 1 --branch v1.0.0` but without getting the '.git' folder in the clone? If possibly I want to avoid having to `rm -rf ../RepoAtV1/.git`
19:02 Jackneill i cloned the repo. edited files/added files. nothing more
19:02 Jackneill i didnt call any git commands
19:02 Jackneill edit/add files: natively on the filesystem not with git
19:02 duarteper joined #git
19:02 Jackneill now i did a stash, new branch on that branch pop
19:02 Jackneill is where i am now
19:03 BPL in fact, it's not the current local branch the one is not being pulled, http://screencast.com/t/1bAgsT2D , anyone knows how to fix it http://stackoverflow.com/a/9076361/3809375 ?
19:04 chris123456 Jackneill Oh I see, but when you switch back to master files you have added are still within the master branch
19:04 Jackneill chris123456, yes, git diff shows the same on both branches
19:04 manuels joined #git
19:04 hahuang61 joined #git
19:05 chris123456 Yeah, you can reset Master at this point as the changes you have made are saved under your new branch (as long as you have committed them)
19:05 Jackneill so is git status
19:05 chris123456 Or you can do git clean
19:05 chris123456 I think git clean is preferable, make sure you do a dry run first as it is possible to accidentally delete important files
19:05 Jackneill if i dont commit the changes on my new branch even i do the reset on master it will vanish?
19:06 axisys how do I know who made change to a file?
19:06 Jackneill or is it enough if i add them on the new branch? its already indexing them is it not?
19:06 axisys git log does not show it until commit is done
19:06 mikecmpbll joined #git
19:06 Jackneill so i add everything on the new branch, switch back to master and then reset HEAD?
19:06 axisys whoever made the change forgot to commit..
19:07 axisys and I want to see who made the change before I commit on that person's behalf
19:08 chris123456 Jackneill, I actually am not sure, I believe it should be enough that they are stored on the other branch but maybe someone with more experience can jump in. I would just commit on it now and then ammend the commit when you have a "full" commit later
19:09 axisys I guess until someone commits it does not show who made the change? git status shows it changed but does not tell who made it
19:09 Jackneill chris123456, well i didnt do anything that would be a problem if it vanishes, so i guess i will just experiment
19:09 Jackneill :)
19:09 chris123456 Haha, let me know the result then, I'm interested!
19:10 joki joined #git
19:11 Jackneill yeah, git reset HEAD says ❯ git reset HEAD                                                                               [20:10:37]
19:11 Jackneill Unstaged changes after reset:
19:11 Jackneill M       CMakeLists.txt
19:11 Jackneill bit a git diff still shows the exact same
19:11 Jackneill so it does nothing
19:11 Jackneill i guess i need to add them at least?
19:12 chris123456 Oh, so because you created a new file git reset HEAD isn't going to delete that file for you
19:12 chris123456 So what you can do is a git clean
19:13 chris123456 or just manaually delete the file
19:13 Jackneill CMakeLists.txt is edited only
19:13 Jackneill i have a dir called bindings which is new and its content (files) are new, but that seems nonexistent for git (well i havent added them after all)
19:14 Limes joined #git
19:14 Texan joined #git
19:15 Texan hey guys, i made a commit with a single change to a file, and pushed it. i wanted to be able to add another file i forgot to include in that commit, but it's already pushed to the server. i know if i didnt already commit it, i can do a git commit --amend, but im not sure how to add this file's changes to the commit i already pushed.
19:15 Jackneill adding it and reseting HEAD doesnt do anything either
19:15 Texan im alright with rewriting history, im 100% confident no one else has touched this repo since i pushed, and likely wont
19:15 troulouliou_div2 joined #git
19:16 Jackneill chris123456, git checkout -- CMakeLists.txt does the job
19:16 chris123456 Texan, you can do a rebase on your local branch, add that file, then push --force your changes to the remote to overwrite that repo
19:16 Jackneill altough my changes vanishes on all branches
19:17 Texan chris123456, you might have to spell that out for me like im literally retarted
19:17 peeps[lappy] joined #git
19:19 vishal Texan: git add forgottenfile; git commit --fixup=HEAD; git rebase -i HEAD~2; <follow the instructions that open>; git push --force
19:19 piling joined #git
19:20 cyan__ joined #git
19:20 pokalyis joined #git
19:20 Texan where you do the <follow instructions>, if i remove the fixup line, will that one be committed? or i need both?
19:21 Texan i wanted the single commit, just with both fixes
19:22 nettoweb joined #git
19:23 vishal Texan: if you remove the fixup line, that will get dropped. You want to say "pick' for the commit+message you want to retain, and then "fixup" for the commit/line which will be squashed transparently into the one above it
19:24 laumann joined #git
19:24 eivarv joined #git
19:25 Texan thanks, this is all new to me. how do i 'pick' that option, since it's in an editor (vim in my case)?
19:25 Texan i would just change 'pick' to 'fixup' for the fixed commit?
19:25 VagabondAzulien joined #git
19:26 vishal pick for the commit that you want as is, fixup for the commit that is for the forgotten file
19:27 vishal so yes change the word in vim 'pick' to 'fixup' at the beginning of the line
19:27 Texan thanks :3
19:28 Texan amag that worked. thank you both
19:28 Texan now to read up on wtf that magic is lol
19:28 grumble joined #git
19:29 vishal I also like to: git config --global rebase.autosquash true
19:29 Cavallari1 joined #git
19:29 vishal which changes 'pick' to 'fixup' automatically for commits you made with the --fixup=<commit> option
19:29 vishal https://robots.thoughtbot.com/autosquashing-git-commits
19:29 vishal that's a good description
19:30 CubiK joined #git
19:31 venmx joined #git
19:34 m___ joined #git
19:34 renlo joined #git
19:34 Cavallari joined #git
19:37 mau joined #git
19:37 finalbeta joined #git
19:37 GavinMagnus joined #git
19:40 Gsham joined #git
19:41 TomyLobo joined #git
19:41 Sna4x8 joined #git
19:43 Sna4x8 I'm stumped.  I have a folder in a local branch (CEA-193) that does not exist in the remote branch.  git pull origin CEA-193 show everything up to date, as does git push origin CEA-193.
19:44 Sna4x8 The last commit hash from git log -1 matches that of the remote branch.
19:44 bocaneri joined #git
19:45 pirate21994 joined #git
19:45 corsibu joined #git
19:47 bitslip joined #git
19:50 refried_ joined #git
19:50 Dazzyp joined #git
19:50 nilg joined #git
19:51 IChoseThisOne joined #git
19:53 matoro joined #git
19:55 Sna4x8 I've been looking around online for a while now, and I'm not sure how to troubleshoot the issue here, or furthermore how to resolve it.  Any help is appreciated.  Here's the output of git branch -v, git log -1, and git reflog: http://pastebin.com/Mh97SncP
19:56 Jackneilll joined #git
19:57 chris64 joined #git
19:57 chris64 hi
19:57 chris64 is there a way to perform a rebase and preserve merges?
19:58 t4nkd joined #git
19:59 Seveas rebase --preserve-merges
20:00 vlt Sna4x8: There are no folders in git repos. Only files.
20:00 Grum joined #git
20:01 sssilver joined #git
20:01 Sna4x8 vlt: Okay, sorry for the slip up.  I do have a folder locally, and that folder contains a number of files.  Those files are not present remotely.
20:01 e14 joined #git
20:02 aarobc joined #git
20:03 dodobrain joined #git
20:03 chris64 Seveas: thank you
20:04 vlt Sna4x8: Can you verify the files are committed locally and not just in your working directory but untracked?
20:04 Seveas Sna4x8: then you didn't add and commit them.
20:05 jmpp joined #git
20:05 chris64 mh
20:05 hahuang61 joined #git
20:05 Sna4x8 vlt: Gah, thanks.  I found the issue afte ryour first comment.  Files are gone from the directory.
20:05 chris64 is it no longer possible to duplicate commits for a rebase?
20:05 Sna4x8 Why they're gone or where they went, I don't know, but not a git issue.
20:05 chris64 I do this usually if I want to split a commit into multiple
20:06 chris64 but now the first one disappears after continueing
20:08 Random832 if git repos don't contain folders why are trees trees instead of there just being a "master list of all files" object?
20:08 _cyril_ joined #git
20:08 cdg joined #git
20:09 vlt Random832: Maybe for efficiency reasons.
20:09 Groscheri joined #git
20:09 vlt Random832: If you have lots of folders that don’t change …
20:10 Random832 yeah but they could be delta encoded against the previous version of the list
20:10 chris64 Are you sure this is just a list? I'd expected git repositories to be merkle tree's
20:11 chris64 where a directory resembles all it's file's contents
20:11 chris64 and the files itself just point to blobs
20:11 MrHacks joined #git
20:11 Random832 chris64: they're tree-structured, but you're not "allowed" to have an empty directory (i forced one to have one just now and it wouldn't let me check it out)
20:12 MrHacks left #git
20:12 chris64 yes
20:13 Random832 the normal git commands will never add an empty directory, i had to use update-index --cache-info with a hash obtained from git hash-object -t tree /dev/null
20:13 mischat joined #git
20:15 relipse how do i prevent a select from scanning ALL of the rows (there are 8 million rows)
20:15 relipse it takes a long time
20:16 chris64 Random832: interesting, why did you want it to exist?
20:17 Fr0stBit joined #git
20:17 jrcharney joined #git
20:18 Random832 just testing whether it would do anything
20:18 Fr0stBit What command can i use to print the currently checked out commit hash, and if it is the HEAD commit?
20:18 Random832 i just realized it tried to create it as a file, i screwed up one of the commands
20:18 jrcharney I'm trying to push a git repo on Window using Git Bash but I get a "remote: error: insufficient permission for adding an object to repository database ./objects" error. What do I need to do to fix the group permissions on my files?
20:20 axisys is there a way to do git commit --dir /etc -a -m 'message' .. so commit only runs under /etc dir .. easier to script that
20:21 whomp hi, how can i get git to consider a new file as a rename from another file, rather than have it think of it simply as a new file
20:21 axisys today in my script i save the present working dir .. and then cd to /etc and run git commit
20:22 sq-one joined #git
20:22 _ikke_ Fr0stBit: the currently checked out commit is the HEAD commit
20:22 _ikke_ Fr0stBit: git rev-parse HEAD
20:22 Siegfried joined #git
20:23 Fr0stBit _ikke_: okk. How do i check also if the current HEAD is the latest head
20:24 axisys found it!
20:24 axisys git --git-dir=/etc/.git --work-tree=/etc status
20:25 AaronMT joined #git
20:25 Rickmasta joined #git
20:25 aidalgol joined #git
20:25 axisys how do I make this an git alias ?
20:26 Random832 ok i got it to do it, and as expected checking it out doesn't actually create the directory on the local filesystem
20:26 Random832 i accidentally had 400000 instead of 40000 for the mode
20:26 axisys wow.. git -C /etc status <== even simpler
20:27 cdown joined #git
20:32 hahuang61 joined #git
20:32 Shentino joined #git
20:33 rmbeer i have a problem for understand the git. All commits and changes like create and destroy files, save all in the .git?
20:34 Absolem yes
20:34 resurtm joined #git
20:35 vlt Fr0stBit: current HEAD _is_ the latest HEAD.
20:35 rmbeer then if i erase something files in the main source code, i can recover this files with git?
20:35 johnmilton joined #git
20:35 vlt relipse: Is this a git question?
20:35 relipse vlt: oops sorry wrong channel
20:36 nidr0x joined #git
20:36 diogenese joined #git
20:36 vlt rmbeer: Yes. Any version of the file you ever committed.
20:37 rmbeer i have the source code in ./ and .git in the ./.git/ , i +/- understand that ./ is the work directory. all source code in ./ change if i use git for change brach or older commits?
20:37 Absolem yes
20:38 rmbeer ah, ok. thank.
20:41 zivester joined #git
20:42 renlo joined #git
20:42 sashito joined #git
20:42 aswen joined #git
20:42 robotroll joined #git
20:43 nicksloan joined #git
20:45 ochorocho__ joined #git
20:46 troulouliou_div2 joined #git
20:46 sashito Is there a clean way to amend your commit message without breaking the repository if you're collaborating?
20:47 Jackneill joined #git
20:47 spiritz joined #git
20:48 rmbeer for test if i can go back to first version, i use the "git checkout [first-version-hash]". but i not view this change in the ./ directory...
20:48 vlt sashito: I don’t think so. Because the commit message is part of the commit info which is used for building the hash :-/
20:48 BSAlb joined #git
20:49 rmbeer lack something?
20:49 vlt rmbeer: Did you et an error message from the checkout command?
20:49 BSab joined #git
20:49 whomp hi, how can i get git to consider a new file as a rename from another file, rather than have it think of it simply as a new file
20:49 whomp ?
20:49 vlt rmbeer: Did you actually commit the files you want to "reset" to a previous version?
20:50 kenden_ joined #git
20:50 vlt whomp: Is the file contents identical?
20:50 sashito vlt: I get that but I've pushed *horror*. FORCE PUSHED. I know the hashes will create an issue but if project collaborators pull, fix conflicts and push their changes like in a normal merge will that be okay?
20:50 whomp vlt, no, maybe 50% of the code from the old file is moved over to the new
20:50 vlt whomp: If yes, then git will figure out by its hash value.
20:50 whomp vlt, it's not :/
20:51 vlt whomp: I would split the commit.
20:51 cdown joined #git
20:51 vlt whomp: First a rename-only, then the edit.
20:51 rmbeer vlt, thinking that no: http://pasteall.org/98987
20:52 rmbeer say that have changed, but not view this change in the work directory of ./
20:52 whomp vlt, i guess the problem is that the old file still exists
20:52 pokalyis joined #git
20:52 whomp so i guess "rename" is not as accurate as "copy"
20:53 vlt whomp: For git it’s the same because it stores the file only once.
20:53 whomp but in the diff, is it supposed to show a rename
20:53 whomp ?
20:54 vlt rmbeer: Can you verify you committed the file to [old-hash]?
20:54 sashito Anyone?
20:54 rmbeer vlt, with git log? yes, i can view it.
20:55 nidr0x joined #git
20:55 vlt rmbeer: ok, then how do you know that the checkout didn’t change the file to its old state?
20:56 rmbeer vlt, why i view the content in the ./ directory that not have change
20:56 vlt whomp: A rename is only a rename if the content hasn’t changed.
20:57 vlt rmbeer: How?
20:57 matsaman joined #git
20:57 whomp vlt, hmm i'll just let it be a new file, thanks :)
20:57 rmbeer vlt, always have the last change. Not have the old directory that i remove.
20:57 jstimm joined #git
20:57 vlt rmbeer: What do you do to check that?
20:57 rmbeer also have the last files that must not exist.
20:58 rmbeer vlt, with "ls"
20:58 vlt rmbeer: How does `ls` tell you that the file is NOT in [old-hash]’s state?
20:59 sashito vlt: Is there anything I need to do if I've already pushed the amended commit?
20:59 tmuwa joined #git
20:59 mizu_no_oto joined #git
20:59 rmbeer not understand. the git checkout change all source directory or not?
21:01 vlt rmbeer: In git terminology ./ is called the working directory. The files that are part of the repo (in .git) will be overwritten by the checkout command (with exceptions).
21:01 jottr_ joined #git
21:02 vlt rmbeer: Can you be more specific? What change in ./ did you expect to happen that didn’t happen?
21:02 vlt rmbeer: And how did you verify that it actually didn’t?
21:02 rmbeer vlt i hope view that remove and create all directories and files by old version
21:02 Dougie187 vlt: .git is not overwritten by a checkout
21:02 rmbeer in the ./
21:03 Dougie187 Only a few will, but for the most part .git isn't modified (since it has all the objects in it)
21:04 sashito vlt: Is there anything I need to do if I've already pushed the amended commit?
21:05 nitric_ joined #git
21:05 vlt sashito: Prepare to buy beer for your collaborators.
21:05 vlt rmbeer: More specific.
21:06 vlt rmbeer: What change? What file?
21:06 rmbeer vlt, i have a copy of all directories from older version to newer version, and with git i added each all changes files one by one of all directory (work in details files i copy/remove/create all directory and files)
21:07 sashito vlt: Ha. Can I fix this anyway?
21:07 rmbeer "git init"+"git add ."+"git commit" in a clean directory for first version. "git commit -a" for each new version in commit.
21:07 vlt sashito: Sure. Set the branch (pointer) to the old commit.
21:07 rmbeer i change all directory and files for each commit
21:08 rmbeer also can view and check the ./ of git and with copy of old version of directory
21:08 Es0teric joined #git
21:09 pokalyis joined #git
21:09 rmbeer i can't back the old commit with git checkout, the ./ content always have the last files/directories
21:09 vlt rmbeer: This is a generic description of what you should have done. To be able to help I need you to be MORE SPECIFIC.
21:09 rmbeer What else should I say??
21:09 sashito vlt: So basically undo the amend? We're just starting up on the project, so is it better to delete and clone again? Can you explain how this is different from a normal merge situation?
21:10 vlt rmbeer: Name a file that you had expected to change that hasn’t.
21:10 rmbeer you have my command lines! take back my command lines!
21:11 rmbeer vlt, naaaah, you kidding me... seem a troll. :/
21:11 byte512 joined #git
21:11 fission6 joined #git
21:12 vlt sashito: A branch name is just a pointer to a commit. If you checkout that commit, delete and recreate the branch it should work. (And I’m sure there must be an even more elegant way.)
21:13 vlt rmbeer: I’m not. It’s hard for me to help you if I have no idea what you’re talking about.
21:13 Dougie187 sashito: Since you force pushed, if your collaborators pulled (and previously had the original commit) then their histories are going to re-introduce the commit you amended.
21:13 Dougie187 sashito: Do you mean you delete and clone again, or your collaborators?
21:13 Dougie187 sashito: And you shouldn't really compare this to a normal merge situation, because it's not that it's different (either way you're merging stuff) it's that you'd have two commits that do the same thing but have different hashes / commit messages.
21:13 rmbeer You ask for irrelevant data. make not sense.
21:13 rmbeer vlt
21:13 zulutango joined #git
21:13 Dougie187 rmbeer: !repro
21:13 gitinfo rmbeer: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
21:14 vlt rmbeer: You don’t have to tell me. I’m just trying to explain that I’m not able to help you now.
21:15 vlt rmbeer: Maybe if you find someone more experienced they can guess how you working firectory looks like.
21:15 vlt *you *directory
21:15 vlt *your
21:15 vlt dammit
21:15 sashito Dougie187: So you mean to see it's not like a normal merge because, instead of merging A->B->C and A->B->D, this is like  A->B->C and A->B'->C?
21:16 HoierM joined #git
21:16 rmbeer vlt, i explain all. but you not understand.
21:16 sashito Dougie187: I meant they delete and clone again since they haven't pushed much. We are in a very initial stage.
21:16 vlt sashito: I don’t think you ever get C from B'
21:16 vlt rmbeer: Yes, correct. I don’t understand it well enough.
21:17 Dougie187 sashito: Really, they only way that your force push is going to potentially cause any issue is if they have branches based off of your amended commit
21:17 sashito vlt: Whoa. Why is that? Why are we given the option to amend stuff if it breaks everything?
21:17 Dougie187 sashito: because B' is different, so C is different.
21:17 jrcharney joined #git
21:17 rmbeer ok. i go back out. :/
21:17 Random832 sashito: because it doesn't break it if you do it before you push
21:18 rmbeer bye
21:18 rmbeer left #git
21:18 Random832 or if you're 100% sure that no-one else has pulled
21:18 sashito Dougie187: You mean branches off of your non-amended commit?
21:18 Dougie187 sashito: Yeah, sorry
21:18 Random832 or if you're willing to tell everyone who has pulled to fix it and they know how to fix it
21:18 jrcharney why does my git repo throw my a "rror: insufficient permission for adding an object to repository database ./objects
21:18 Random832 git is a toolbox - some tools are sharp.
21:18 Dougie187 sashito: If they branched off of their non-amended commit, then you *might* have a problem later. But if they didn't it's not a big deal.
21:18 renlo joined #git
21:19 jrcharney why does my git repo throw my a "rror: insufficient permission for adding an object to repository database ./objects" error when my objects database is in .git/objects?
21:19 sashito Whoa. I get why C is different. So beyond B' everything is changed?
21:19 sashito Random832: I did amend before I pushed :/ I don't think I follow.
21:19 Dougie187 sashito: If B is what you amended, and it's in the middle of a branch, yes. Everything after B' would be different too
21:19 vlt jrcharney: Maybe someone pushed as root (happened to me once).
21:19 Dougie187 sashito: A commit's hash depends on the contents of the commit, but also the commit's parent(s)
21:20 Dougie187 So, if you change the hash of a parent, the hash of the child changes too.
21:20 ramsub07 joined #git
21:20 Random832 sashito: as in before the first time you pushed, i.e. if you never pushed the non-amended commit
21:20 jrcharney who is root on ec2? Is it ec2-user?
21:20 joki joined #git
21:20 sashito Dougie187: There's 1 branch based off it but I amended the last commit in it.
21:20 vlt jrcharney: I have on clue about ec2.
21:20 Dougie187 Ok, So then your situation is more like A->B is changed to A->B'
21:21 Dougie187 Assuming A is the parent of B
21:21 jrcharney OK. just wondering. I'll look into it.
21:21 sashito Random832: Ah. I did push the non-amended commit.
21:21 Dougie187 If there are no branches that other developers have containing B, then you won't have a problem down the road.
21:22 Dougie187 Regardless, you need to talk to your developers.
21:22 Dougie187 Because if you force push B' with B (to remove your change) if any developer has B' in their branch, it would potentially cause issues as well.
21:22 sashito Dougie187: I know this will sound stupid, but can they *just* delete and clone again?
21:22 Dougie187 Do they use forks?
21:22 sashito Dougie187:  forks
21:22 Random832 sashito: they can but if you make them do this and they had other changes in their local copy it will be annoying
21:22 sashito *No forks
21:23 Dougie187 sashito: then yes, if they delete / clone again (and they never pushed their branches which were based off of B or B') then you're fine.
21:23 sashito Random832: That's the thing. They haven't done much.
21:23 Dougie187 But you can check if they push B or B'.
21:23 Dougie187 If you do `git fetch <remote_name>; git branch -r --contains <B>`
21:23 Dougie187 That will tell you any branches in the remote that contain your unamended commit
21:24 vlt sashito: Wouldn’t it be much easier for everyone if you just restored your original B commit?
21:24 Random832 reminds me of the xkcd comic on git: If you get errors, save your work elsewhere, delete the project, and download a fresh copy.
21:25 Dougie187 At least, if you still know the hash for it
21:25 Dougie187 vlt: No, if they branched off of B' it's the same problem.
21:25 Dougie187 Since he force pushed, he needs to talk to his developers.
21:25 sashito So basically the situation is like there's 2 branches master and dev. Master has A->B->C which I amended to A->B->C' and the branch dev is A->B->C->D.
21:25 madknight Random832, but reset hard origin/master should be the same
21:25 piling_ joined #git
21:26 pokalyis joined #git
21:26 anuxivm joined #git
21:27 sashito vlt: Are you asking me to reset that and commit new changes instead of amend the previous one? How can one do that for a commit name? :/
21:27 Dougie187 sashito: OK, so the dev branch A->B->C->D needs to be changed to A->B->C'->D' if you want to keep your amended commit
21:27 sashito Random832: I get that this makes git redundant. *sigh*
21:28 Dougie187 sashito: No, he's suggesting that you replace C' with C
21:28 Dougie187 sashito: But if you have developers with fetches that have C' in them, then the problem is no different.
21:28 sashito Dougie187: I was referring to the xkcd comment.
21:28 Dougie187 Hopefully that makes some sense.
21:28 Dougie187 sashito: Yeah, I was referring to your question to vlt
21:29 sashito Dougie187: Right.
21:29 Dougie187 Anyway, time for me to go.
21:29 Dougie187 Have fun!
21:29 Dougie187 left #git
21:29 madknight 90% of the problems described here are history rewriting problems or related
21:30 APic *shrug*
21:31 nivag joined #git
21:31 sashito A lot due to git being all about version control right?
21:32 APic GIT
21:33 converge joined #git
21:33 converge joined #git
21:33 BSaboia joined #git
21:33 sashito APic: Huh?
21:34 a3Dman_ joined #git
21:35 lacour joined #git
21:35 APic Huh.
21:36 sashito vlt: So how do I get feature branch in sync with the master branch?
21:38 Sasazuka__ joined #git
21:39 strugee joined #git
21:41 cdown joined #git
21:41 pokalyis joined #git
21:42 g105b joined #git
21:42 ArchNoob joined #git
21:42 barteks2x joined #git
21:46 done joined #git
21:47 vlt sashito: "in sync"?
21:47 SpeakerToMeat joined #git
21:48 Ufor joined #git
21:48 nitric joined #git
21:48 tvw joined #git
21:48 sashito As in feature branch is branched off a non-amended commit. Can I make it point to the amended commit?
21:49 sashito vlt: PM?
21:50 Sasazuka joined #git
21:50 joki joined #git
21:50 mischief left #git
21:52 cirkit joined #git
21:56 fission6 joined #git
21:57 renlo joined #git
21:57 ayjay_t joined #git
21:57 jottr joined #git
22:00 vlt sashito: Just rebase.
22:00 Sasazuka joined #git
22:00 marcomarcaccini joined #git
22:03 todd_dsm joined #git
22:03 jottr_ joined #git
22:04 raijin joined #git
22:07 blackwind_123 joined #git
22:10 rmbeer joined #git
22:10 rmbeer hello
22:10 rmbeer i post the new bug...
22:11 rmbeer #883
22:11 rmbeer in this can view all command lines with examples.
22:12 rmbeer good night.
22:12 rmbeer left #git
22:16 xall joined #git
22:19 axisys cool... .git/index.lock is what I was looking for to avoid multiple users commiting at the same time on same repo..
22:20 cyberlard joined #git
22:21 axisys who gets the credit/blame? one who committed or one who pushed? I think committer.. but need a confirmation as I am the only one working on the repo right now, so hard to test
22:21 Sasazuka__ joined #git
22:23 jstein_ joined #git
22:23 GavinMagnus left #git
22:23 snowkidind joined #git
22:23 avar The committer isn't always the person who pushed, that's not recorded in the commit.
22:24 avar But it's the author who shows up in "git blame"
22:24 bannakaffalatta joined #git
22:26 selckin i don't understand anything hes saying
22:26 jaafar joined #git
22:26 axisys avar: our team will be committing changes all day.. and we like to push once in a while
22:26 mischat joined #git
22:27 axisys may be with a cron.. is it possible to add the committer info in commit log?
22:27 selckin nothing you are saying makes any sense to me :(
22:27 e14 joined #git
22:27 avar You can add pretty much anything you like to the commit object.
22:28 LaptopBrain joined #git
22:28 avar I'm just saying that "push" has nothing to do with what sort of objects you're pushing
22:28 avar E.g. I could go and push some commits Linus Torvalds made in 2005 to github right now, and no repo-level metadata would indicate that I was involved
22:28 avar But I could also amend those commits and say Mickey Mouse committed them
22:29 sangy joined #git
22:29 axisys avar: so my goal is to keep track of who is making changes to the config files .. everyone in my team is already setup with a .gitconfig file with their name and email addresses
22:30 axisys ok.. I think I got it...
22:30 butters_ joined #git
22:30 axisys like you said Author: info is there in every commit
22:30 avar Yes, just arrange for people who make the change to "git commit" their changes, then it'll just work unless you go out of your way to ruin it
22:31 jeremyhall joined #git
22:31 avar You start having to worry about stuff if you have someone, or some system, create commit objects for someone else's changes
22:31 axisys so Author will be whoever doing the commit and so it will have the info of the committer..
22:31 axisys avar: newbie here.. I am following you.. appreciate it!
22:32 avar Run this in any git repo: git show --pretty=fuller
22:32 avar There's both an author & who made the commit, and timestamps for both, usually these are both the same thing.
22:33 avar But e.g. if you "git am" someone else's patch, i.e. apply a patch you got over e-mail, the author will be them but you're the committer
22:33 Seveas unless your workflow is based on mailing patches around and/or rebasing/cherry-picking other people's commits
22:33 axisys selckin: not sure how to explain it to you since nothing I say makes any sense to you in the first place.. sorry
22:34 Dougie187 joined #git
22:34 e14 joined #git
22:34 selckin axisys: well it started to make sense when you said "my goal is"
22:34 axisys we have config files for T+ and anyone in my team has the right to modify the config and then commit
22:35 axisys selckin: cool.. I guess I have to explain what am I trying to do instead of how git can do it for me.. heh
22:35 axisys T+ being TACACS+
22:36 b1tchcakes joined #git
22:36 selckin axisys: common problem, google xy questions
22:39 xaa joined #git
22:44 CubiK joined #git
22:44 SwiftMatt joined #git
22:46 shmuli joined #git
22:46 useless_person left #git
22:46 done joined #git
22:47 venmx joined #git
22:47 ToBeCloud joined #git
22:47 shgysk8zer0 joined #git
22:48 gfixler joined #git
22:49 disi instead of git rebase --continue.... is there a way to go back into the squash/edit/fixup menu again?
22:49 cbreak disi: git rebase --abort, then restart it
22:50 cbreak disi: there's also the rebase program file somewhere inside the .git dir, but I don't know if you're allowed to change it
22:50 disi cbreak: if i was editting a commit, where i added/inserted a commit, and then --abort... wont it throw away my edits/new commit?
22:51 cbreak it will
22:51 disi humanBird: you're not mounting :ro are you?agh, bummer
22:52 disi doh, mixed messages.... "agh bummer" was meant
22:54 inflames joined #git
22:56 safe joined #git
22:58 Gsham joined #git
22:59 fscala joined #git
23:01 jstimm joined #git
23:02 Seveas disi: git rebase --edit-todo
23:03 disi Seveas: =D woohoo! i'll give that a go, thanks
23:04 crayon joined #git
23:06 catern joined #git
23:06 Jameser joined #git
23:06 asti joined #git
23:06 asti hello
23:06 asti can someone please tell me, how do I undo changes I made to an unmerged file?
23:07 cyphase joined #git
23:08 cbreak asti: git checkout
23:08 cbreak asti: look at -m and -p
23:09 Sound joined #git
23:10 asti cbreak: didnt work
23:10 asti it says `error: path .... is unmerged`
23:10 cbreak that's the point
23:10 cbreak -m will make it unmerged
23:13 Muzer joined #git
23:17 FilipNortic_ joined #git
23:18 pirate21994 joined #git
23:18 holgersson joined #git
23:18 converge joined #git
23:18 converge joined #git
23:18 raatiniemi joined #git
23:19 tom[] joined #git
23:19 jave joined #git
23:20 sssilver joined #git
23:21 Cork joined #git
23:21 inflames joined #git
23:22 dsantiago joined #git
23:23 dsantiag_ joined #git
23:23 crayon joined #git
23:27 mischat joined #git
23:28 Dev0n joined #git
23:31 shmuli joined #git
23:33 converge joined #git
23:33 converge joined #git
23:36 KnownSyntax joined #git
23:40 snthsnth joined #git
23:42 danslo joined #git
23:45 Noldorin joined #git
23:45 dbkaplun left #git
23:46 KnownSyntax joined #git
23:46 KnownSyntax joined #git
23:47 dodobrain joined #git
23:48 madewokherd joined #git
23:49 Lor_ joined #git
23:50 rbern joined #git
23:53 gdelfino joined #git
23:57 xall joined #git
23:58 popmystack joined #git
23:59 thiago joined #git

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