Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-03

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

All times shown according to UTC.

Time Nick Message
00:03 drodger joined #git
00:04 jameser joined #git
00:05 navidr joined #git
00:06 theiostream joined #git
00:06 blackwind_123 joined #git
00:08 BSaboia joined #git
00:08 Cabanossi joined #git
00:09 mizu_no_oto joined #git
00:15 blackwind_123 joined #git
00:20 _28_ria joined #git
00:21 livingstn joined #git
00:22 blackwind_123 joined #git
00:28 blackwind_123 joined #git
00:28 matoro joined #git
00:29 theiostr_ joined #git
00:34 roelmonnens joined #git
00:37 blackwind_123 joined #git
00:42 Brain2222 joined #git
00:44 fatalhalt joined #git
00:50 boombatower joined #git
00:51 tmsmith joined #git
00:52 jokajak joined #git
00:53 fatalhalt joined #git
00:54 theiostream joined #git
00:55 [Brain] joined #git
00:56 Emperor_Earth joined #git
00:57 jameser joined #git
00:58 jokajak joined #git
00:58 Brain22 joined #git
00:59 tmsmith joined #git
01:00 [Brain]2 joined #git
01:02 Gustavo6046 joined #git
01:04 tmsmith joined #git
01:05 peterbecich joined #git
01:07 jokajak joined #git
01:07 basdb joined #git
01:08 pionen joined #git
01:09 tmsmith joined #git
01:10 jokajak joined #git
01:10 raijin joined #git
01:11 a_thakur joined #git
01:16 robattila256 joined #git
01:16 peterbecich joined #git
01:17 tmsmith joined #git
01:19 finalbeta joined #git
01:20 jokajak joined #git
01:20 matoro joined #git
01:22 fstd_ joined #git
01:23 XenophonF joined #git
01:24 Cabanossi joined #git
01:24 LeBlaaanc joined #git
01:24 wilbert joined #git
01:34 echosystm joined #git
01:34 echosystm hi guys
01:34 hahuang61 joined #git
01:34 _Vi joined #git
01:36 cyberz joined #git
01:36 orbyt_ joined #git
01:37 Noodlewitt joined #git
01:37 echosystm i have a "build" branch that i need to periodically make match an arbitrary point in the repo
01:37 echosystm it could be a tag, a point on a release branch, master, whatever
01:38 ankit01ojha joined #git
01:38 echosystm at the moment, i'm just deleting the branch and branching off the commit i want
01:38 echosystm is there any better way to "sync" a branch to an arbitrary commit?
01:39 pks joined #git
01:39 preaction echosystm: you could use reset, but it sounds more like you want tags
01:39 sunri5e joined #git
01:39 echosystm my CI tool only works with branches
01:40 rchavik joined #git
01:40 tmsmith joined #git
01:42 a_thakur joined #git
01:46 mizu_no_oto joined #git
01:46 gugah joined #git
01:47 ollien joined #git
01:47 Rodya_ joined #git
01:50 jokajak joined #git
01:53 fuzzybear3965 joined #git
01:56 d^sh joined #git
01:57 a3Dman joined #git
01:58 a_thakur joined #git
02:00 dermoth joined #git
02:01 dreiss joined #git
02:02 amosbird joined #git
02:03 onehrxn joined #git
02:08 Allonphone joined #git
02:11 ljc joined #git
02:16 SwiftMatt joined #git
02:16 Allonphone left #git
02:17 lagothri1 joined #git
02:19 tmsmith joined #git
02:20 gugah joined #git
02:21 hexagoxel joined #git
02:21 impermanence joined #git
02:22 impermanence I moved directory structure with files and thought that doing a "git add *" would push everything to my remote.  It pushed the directory structure, but not the files.  How can I fix this?
02:23 impermanence I've tried several things, but to no avail.
02:23 roelmonnens joined #git
02:23 Cabanossi joined #git
02:28 impermanence joined #git
02:29 dreiss joined #git
02:29 SilverBe joined #git
02:30 impermanence Sorry if anyone responded.  I had to restart my hotspot quickly.
02:30 impermanence I moved directory structure with files and thought that doing a "git add *" would push everything to my remote.  It pushed the directory structure, but not the files.  How can I fix this?
02:30 impermanence I've tried several things, but to no avail.
02:30 svm_invictvs joined #git
02:31 tmsmith joined #git
02:33 blackwind_123 joined #git
02:38 chachasmooth joined #git
02:39 tmsmith joined #git
02:41 kadoban joined #git
02:44 Keunjun joined #git
02:44 lb1c joined #git
02:47 venmx joined #git
02:49 PioneerAxon joined #git
02:49 luke_nukem joined #git
02:51 SamSagaZ__ joined #git
02:53 a_thakur joined #git
02:56 SwiftMatt joined #git
02:58 deltab impermanence: not sure what you mean by "pushed the dirctory structure": git generally doesn't care about directories, only the contents of the files in them
02:59 learning joined #git
02:59 Vortex34 joined #git
03:00 jeffreylevesque joined #git
03:03 NoOutlet joined #git
03:03 _Vi joined #git
03:04 ISmithers joined #git
03:06 crelix joined #git
03:07 ojdo joined #git
03:08 xall_ joined #git
03:08 roelmonnens joined #git
03:09 justan0theruser joined #git
03:10 durham joined #git
03:10 durham joined #git
03:14 raijin joined #git
03:16 BSAlb joined #git
03:19 learning joined #git
03:20 mattp_ joined #git
03:20 metachr0n joined #git
03:23 DarkPsydeLord joined #git
03:24 Cabanossi joined #git
03:24 mizu_no_oto joined #git
03:27 miczac joined #git
03:28 Darren_ joined #git
03:30 Andrew_K joined #git
03:33 mehola joined #git
03:34 aavrug joined #git
03:34 robotroll joined #git
03:34 dreiss joined #git
03:34 Noldorin joined #git
03:35 hahuang61 joined #git
03:38 livingstn joined #git
03:40 hvxgr joined #git
03:43 impermanence joined #git
03:50 Abbott joined #git
03:50 tmsmith joined #git
03:51 dsdeiz joined #git
03:52 Cabanossi joined #git
03:53 svm_invictvs joined #git
03:56 dsdeiz joined #git
03:57 cyberz joined #git
03:57 dreiss joined #git
04:00 a_thakur joined #git
04:02 dsdeiz joined #git
04:02 a_thakur joined #git
04:03 mda1 joined #git
04:05 marianina8 joined #git
04:05 amrits joined #git
04:09 Abbott left #git
04:13 midnightmagic joined #git
04:15 livingstn joined #git
04:15 peterbecich joined #git
04:16 mehola joined #git
04:18 PtxDK joined #git
04:21 mattcen joined #git
04:24 atomi joined #git
04:26 urda joined #git
04:26 buzzLightBeer joined #git
04:26 ploop joined #git
04:28 Noodlewitt joined #git
04:28 renatosilva joined #git
04:29 renatosilva left #git
04:31 mehola joined #git
04:33 blunaxela joined #git
04:41 impermanence joined #git
04:42 _Vi joined #git
04:45 sarri joined #git
04:45 sarri joined #git
04:48 venmx joined #git
04:48 pks joined #git
04:48 livingstn joined #git
04:50 impermanence joined #git
04:50 xkr47 joined #git
04:56 hhee joined #git
04:59 d^sh joined #git
04:59 freimatz joined #git
05:00 elsevero joined #git
05:00 Levex joined #git
05:05 TbobbyZ joined #git
05:06 dec0n joined #git
05:10 MineCoins joined #git
05:11 _ng joined #git
05:15 dendazen joined #git
05:19 cyberz joined #git
05:21 overlord_tm joined #git
05:22 TbobbyZ joined #git
05:25 mikecmpbll joined #git
05:26 cyberz joined #git
05:26 atomi joined #git
05:28 atomi joined #git
05:30 marianina8 joined #git
05:30 atomi joined #git
05:31 Brski joined #git
05:32 gtristan joined #git
05:33 Brski joined #git
05:33 dersand joined #git
05:35 IRCFrEAK joined #git
05:35 dreiss joined #git
05:35 hahuang61 joined #git
05:37 IRCFrEAK left #git
05:38 Ph_ joined #git
05:40 Raging_Hog joined #git
05:42 IRCFrEAK joined #git
05:44 IRCFrEAK left #git
05:45 marianina8 joined #git
05:46 acetakwas joined #git
05:51 lordjancso joined #git
05:52 roelmonnens joined #git
05:56 raijin joined #git
05:56 ThomasLocke joined #git
05:58 diogenese joined #git
06:01 rscata joined #git
06:09 freimatz joined #git
06:10 jozwior joined #git
06:10 MineCoins joined #git
06:11 qt-x joined #git
06:12 causasui joined #git
06:12 _Vi joined #git
06:15 _28_ria joined #git
06:17 menip joined #git
06:19 JeroenT joined #git
06:20 roelmonnens joined #git
06:22 babilen joined #git
06:22 babilen joined #git
06:25 cyberz joined #git
06:26 zeroed joined #git
06:38 mehola joined #git
06:39 Levex joined #git
06:39 chele joined #git
06:40 zerow joined #git
06:42 alexandre9099 joined #git
06:51 zeroed joined #git
06:52 Cabanossi joined #git
06:55 kontinuity joined #git
06:56 cyberz joined #git
06:57 zefferno joined #git
06:59 imack joined #git
07:00 elect_ joined #git
07:04 jnavila joined #git
07:05 rominronin joined #git
07:09 strk joined #git
07:10 strk how do I change the tracknig branch for a local one ? git pull -u newremote newbranch # did not do that (as I expected)
07:11 chardan joined #git
07:12 selckin git branch -u origin/other
07:13 strk thanks selckin
07:15 sotoz joined #git
07:15 rokups joined #git
07:17 strk left #git
07:18 MrWoohoo joined #git
07:18 Murii joined #git
07:21 johnny56 joined #git
07:27 p4trix joined #git
07:31 astrofog joined #git
07:33 gfvkdd joined #git
07:33 dwts joined #git
07:36 finalbeta joined #git
07:36 sea-gull joined #git
07:37 peterbecich joined #git
07:37 hahuang61 joined #git
07:40 IRQ` joined #git
07:43 prg3 joined #git
07:43 midnightmagic joined #git
07:44 MarioJC joined #git
07:44 finalbeta joined #git
07:46 Darcidride joined #git
07:48 manuelschneid3r joined #git
07:48 fees joined #git
07:51 djb-irc joined #git
07:52 Nilesh_ joined #git
07:52 mikecmpbll joined #git
07:52 Cabanossi joined #git
07:54 scoobertron joined #git
07:55 brk_ joined #git
07:56 no_gravity joined #git
07:56 no_gravity It would be nice if "git diff hell" would assume "hello.php" if there is only one staged file that matches .*hell.*
07:57 selckin hell*
07:59 no_gravity I tried *hell*, but it seems not to work for /something/says/helloWorld.php
08:00 lucasem joined #git
08:00 Vampire0 no_gravity, try '*hell*'
08:00 selckin shell is expanding it
08:00 Vampire0 no_gravity, if your shell already expanding the stars, then Git has no chance to handle them itself
08:00 no_gravity Vampire0: Did not find it either.
08:00 cyberz joined #git
08:00 elsevero joined #git
08:00 no_gravity I doubt it is expanding.
08:00 Vampire0 no_gravity, you included the quotes in your try?
08:00 selckin put echo in front of it
08:00 no_gravity Vampire0: I tried with and without quotes.
08:01 osse no_gravity: git diff' :/**/*hell*'
08:01 osse no_gravity: git config alias.pdiff '!git diff -- ":/**/*$1*" && :'
08:01 osse git pdiff hell
08:02 nowhere_man joined #git
08:02 dreiss joined #git
08:03 no_gravity Thanks. ":/**/*hell*" finds it. Will have to do some tests to see what exactly it matches.
08:03 saidelike joined #git
08:04 dvaske joined #git
08:05 rchavik joined #git
08:08 Bin4ry joined #git
08:09 no_gravity Is there a common way to mark a commit as a bug fix?
08:10 selckin no
08:10 osse best i can think of is "fix:" at the start of the message
08:10 no_gravity Yeah
08:10 osse or the bug tracker key if appricabru
08:10 utrack joined #git
08:11 no_gravity Will go with "Fix:"
08:11 metachr0n joined #git
08:13 Milos joined #git
08:13 marcogmonteiro joined #git
08:13 choki joined #git
08:13 no_gravity Would be nice to have a reference to the commit that introduced the bug.
08:13 no_gravity So one could run stats on who creates how many bugs etc.
08:13 schleppel joined #git
08:14 masuberu joined #git
08:15 selckin ppl do that outside in bug trackers
08:15 xall_ joined #git
08:15 no_gravity Yeah. I wonder if there is a way to put such metadate right into the history.
08:15 vrach joined #git
08:16 selckin no because you can't edit it
08:16 grawity "Fix: <commit_id>"
08:16 nowhere_man joined #git
08:16 grawity some people use `git notes` for annotating old commits
08:17 synbit joined #git
08:17 no_gravity selckin: Wouldn't that argument apply for anything you want to put into the history?
08:17 selckin if you're really small that might work, but then the data is useless, if you're bigger (more ppl) then it'll need to be easily modified/corrected after futher analysis or disputes
08:18 redeemed joined #git
08:18 Es0teric joined #git
08:19 no_gravity selckin: Not sure. "Fix commit a382..." would mean the author *claimed* to have fixed commit a382. If he claims a lot of bs then so be it.
08:19 selckin you have any idea what shit storms you are opening by trying to get stats on how many bugs ppl created you will need to be able to correct this
08:19 selckin or work alone
08:20 no_gravity The stat would say "In 57 cases, people have claimed to fix stuff by joe".
08:20 no_gravity Which is correct.
08:20 p4trix joined #git
08:21 no_gravity If people claim a lot of bs, that's another story.
08:21 selckin you have any idea how office politics will make ppl "fix" really minor trivial stuff and search for it
08:21 selckin the line between fix and improve is tiny
08:22 _ikke_ "Fix whitespace bug" :P
08:22 no_gravity Sure. Then you can say "Vanessa always claims to fix my stuff while in fact she just improved it by adding whitespace."
08:22 selckin but then one year, bonusses will handed out on only the stats
08:22 selckin and your good ppl will quit
08:23 selckin but they made 30 logical commits, instead of 1 big dump of crap, so it counted for more, or they did tripple the work
08:23 tmg :q
08:23 selckin either way your company is about to die
08:24 _ikke_ I agree with selckin
08:24 a_thakur joined #git
08:24 _ikke_ same thing with doing sloc measurements
08:24 stfn joined #git
08:24 no_gravity Is pull the same as fetch and merge?
08:25 _ikke_ yeah, fetch + (merge|rebase)
08:25 ronator joined #git
08:27 zulutango joined #git
08:30 mehola joined #git
08:31 _Vi joined #git
08:32 mindfart joined #git
08:32 t0by joined #git
08:32 no_gravity After doing "git fetch /some/other/repo" - how can I see the changes that would be merged if I merge?
08:34 theoceaniscool joined #git
08:34 _ikke_ git diff @{upstream{
08:34 _ikke_ git diff @{upstream}
08:34 no_gravity fatal: No upstream configured for branch 'master'
08:34 vrishab joined #git
08:35 jackhum joined #git
08:35 grawity @{u} is only updated when you're in fact fetching the upstream repo
08:35 grawity otherwise diff against remotename/master, or even FETCH_HEAD
08:35 no_gravity How do I diff against FETCH_HEAD?
08:36 _ikke_ no_gravity: I would do: git branch --set-upstream-to origin/master master (if the remote is called origin)
08:36 no_gravity The remote is not called anythin at all.
08:37 no_gravity It's just a repo somewhere.
08:37 grawity then you need to literally use FETCH_HEAD
08:37 _ikke_ right
08:37 no_gravity Awesome.
08:37 no_gravity Thanks.
08:38 tapout joined #git
08:39 a_thakur joined #git
08:40 ssarah joined #git
08:42 permalac joined #git
08:44 overlord_tm joined #git
08:45 Tobbi joined #git
08:46 Bin4ry joined #git
08:47 Endarked joined #git
08:48 venmx joined #git
08:49 no_gravity Would a "git checkout master" undo all changes in the working directory?
08:50 marianina8 joined #git
08:50 _ikke_ no
08:50 notebox joined #git
08:51 _ikke_ git would abort the operation if it had to overwrite anything
08:51 no_gravity Why?
08:51 selckin because it doesn't like you to lose data
08:51 no_gravity But the new data is shit :)
08:51 no_gravity So how do I undo the shit?
08:52 elect__ joined #git
08:52 selckin git reset HEAD .; git checkout -- .; git clean -xdf
08:52 p4trick joined #git
08:52 no_gravity What does "git reset HEAD ." do?
08:52 selckin unstage
08:53 Cabanossi joined #git
08:53 perlpilot_ joined #git
08:53 JanC_ joined #git
08:53 _ikke_ (Checking out files, instead of just a branch is a different matter)
08:53 davimore_ joined #git
08:53 mar77i joined #git
08:53 selckin i read "undo this shit" as "cleanup my workdir" maybe not waht you meant
08:54 _ikke_ git reset --hard HEAD # cannot be undone
08:54 no_gravity The situation is this: My coworkder tried to "pull /his/repo/" and then aborted because he got a merge commit prompt.
08:54 leeN joined #git
08:54 dvaske joined #git
08:54 _ikke_ git merge --abort
08:54 _ikke_ then
08:54 no_gravity Now the working tree is fucked up.
08:54 no_gravity And also some nonsnse is staged.
08:55 _ikke_ It's just a partial merge, with conflicts
08:56 cliluw joined #git
08:56 mda1 joined #git
08:56 Knirch joined #git
08:57 Bin4ry joined #git
08:58 no_gravity "git merge --abort" seems to have worked.
08:59 no_gravity Thanks, _ikke_
09:02 zxd joined #git
09:02 zxd hi
09:03 zxd reading git pack-refs 'The command by default packs all tags and refs that are already packed, and leaves other refs alone.'   if it's already packed how does it "pack it again" don't get it
09:04 borkr joined #git
09:05 sim590 joined #git
09:06 kaldoran joined #git
09:08 drodger joined #git
09:14 kbeflo joined #git
09:15 no_gravity When a "git pull --rebase" fails because of a merge conflict, can it also be undone with "get merge --abort"?
09:17 Grievre git rebase --abort
09:18 xaa joined #git
09:18 zxd what does         fetch = +refs/*:refs/*  this mean in [remote ] section in git config
09:18 bitmod_ joined #git
09:21 ti2 zxd: that refspec mirrors all refs from the remote repository locally
09:21 canton7 (so instead of 'master' on 'origin' being fetched into 'origin/master', instead it will overwrite your local 'master' branch)
09:22 canton7 clone --mirror probably sets that fetchspec
09:22 lmatteis joined #git
09:22 spica joined #git
09:23 spica hi guys. How can I quickly change the message of my last commit if I've already pushed it to github?
09:23 tlaxkit joined #git
09:24 zxd what the differene between  git fetch , and git remote update
09:24 zxd both will fetch new branches no?
09:25 jast yes, there is little difference. 'git remote update' defaults to updating all the remotes ('git fetch' needs the --all option for that)
09:25 Blkt joined #git
09:25 amrits joined #git
09:27 zxd ah
09:27 zxd also was surprised to see that ' git log' in a bare repository works, I thought git always looked for a directory named .git/  to search for its files
09:28 canton7 git knows what a bare repository is, can figure out when a repository is bare, and will work accordingly
09:28 zxd canton7: how?
09:29 canton7 no idea, you'll have to read the code. Presumably if it doesn't find a .git dir, it check to see if there's a bare repository
09:29 canton7 *it checks
09:30 King_Hual joined #git
09:32 no_gravity Is there a way to only "compare" two repos without any changes being done?
09:33 selckin add as remote and diff? or does that count as a change
09:33 no_gravity Yeah, that count as a change.
09:33 yarekt Do you want to compare the working tree only?
09:33 jast what do you want to compare about the repos?
09:33 mehola joined #git
09:33 no_gravity There should be *no* change in /somewhere/myproject/ and *no* change in /elsewhere/otherproject/
09:34 no_gravity Yes, comparing the working tree would be enought in this use case.
09:34 jast git diff can be run from outside git repos
09:34 yarekt simple diff will suffice
09:35 no_gravity jast: "git diff /my/project/ /some/other/project/" ?
09:35 jast unfortunately in that case it will behave much like the normal 'diff' tool, not skipping Git's metadata files
09:35 jast yes
09:35 sotoz joined #git
09:35 no_gravity yarekt: The linux command "diff"?
09:35 jast so you may want to incldue a few ignore/exclude patterns on the command line
09:35 yarekt no_gravity: Yes
09:35 no_gravity Lets see...
09:35 Forlorn joined #git
09:36 no_gravity "git diff /my/project/ /some/other/project/" running...
09:36 no_gravity Jesus, that ouputs a gazillion lines. Yeah, would have to exclude .git/ somehow.
09:36 yarekt -x .git
09:37 yarekt Though I'm not sure if it does path matching, Maybe run it through find first or something
09:37 hahuang61 joined #git
09:38 no_gravity yarekt: Like this? "diff -x .git /my/project/ /some/other/project/"?
09:38 no_gravity That gives me some strange output.
09:38 Introoter joined #git
09:39 Ice_Strike joined #git
09:40 maarhart joined #git
09:40 kexmex joined #git
09:51 zxd does it matter how I store the name of a bare repository with   foo.git or just foo ? github probably has symlink to reach either one ?
09:54 osse zxd: not sure whether git itself will check both addresses, but regardless git doesn't care
09:54 osse zxd: the convention is to use .git on bare repos
09:54 Snugglebash joined #git
09:54 Scoop7 joined #git
09:54 atomi joined #git
09:56 no_gravity What is the way to undo a commit?
09:57 cebor joined #git
09:57 Scoop7 Hello if I have a laravel project and on my shared server plan I have git 1.7.1 - what is my best bet to use git version control for deployment? Not really sure about bare and non-bare reps differences. But as I know 1.7.1 only supports one of them.
09:57 osse no_gravity: depends on the circumstances.
09:57 osse no_gravity: !revert
09:57 gitinfo no_gravity: 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]?
09:59 no_gravity osse: Somebody did a "git pull /his/project/ in "/our/project/". I would like the dir "/our/repo/" to be exactly the way it was before the pull.
09:59 Raging_Hog joined #git
10:00 tobiasvl no_gravity: so you want to undo a merge, then? you can do a "git reset --hard ORIG_HEAD" perhaps, but take a look at ORIG_HEAD first to see if it's what you want (and remember that --hard is potentially destructive)
10:00 cebor joined #git
10:01 TomyWork joined #git
10:03 rebrec joined #git
10:04 MarioJC joined #git
10:06 no_gravity tobiasvl: From the !revert info, "git reset --soft HEAD^" sounds like it will undo the commit. Is it different from "git reset --hard ORIG_HEAD"?
10:06 gitinfo tobiasvl: 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]?
10:07 Cabanossi joined #git
10:11 tkilian2 joined #git
10:13 lowercaseman joined #git
10:14 tobiasvl no_gravity: well, do you want to undo a commit or a merge? both should work for what you want. you can look at "git reset --merge" too.
10:15 no_gravity tobiasvl: I want to undo the merge. The other user did a "git pull /his/repo/" and we want to undo it.
10:15 Wikiscratch joined #git
10:16 no_gravity The whole pull should be undone. To bring the /our/project/ directory into the state it was before the pull.
10:17 henriknj joined #git
10:18 rideh joined #git
10:18 tobiasvl then you don't want to undo a commit, and --soft is probably not what you want (it would unstage the changes introduced by the merge). I'd go with "git reset --hard ORIG_HEAD" as long as ORIG_HEAD is the ref you want to reset too (ie. you haven't done any merges or other stuff since the faulty merge).
10:19 osse undoing the pull with revert will bring the directory into the old state
10:19 osse if the guy has not made commits after that
10:20 no_gravity How about "git reset --hard XXX" where XXX is the hash from "git reflog"?
10:20 tobiasvl no_gravity: that should be the same thing as what I suggested, yes (as long as ORIG_HEAD has not changed)
10:20 no_gravity tobiasvl: Awesome, thanks!
10:22 aryan joined #git
10:23 scoobert1on joined #git
10:24 no_gravity Can "git commit --amend" be used to change the commit message of the latest command without changing anything else?
10:24 marcogmonteiro joined #git
10:26 osse yes
10:26 no_gravity osse: Thanks!
10:27 cebor joined #git
10:28 no_gravity "git reset --hard ORIG_HEAD" has not really reversed the impact of the pull.
10:28 no_gravity It's all still visible in "git reflog".
10:28 osse doesn't matter
10:28 osse reflog is a separate, local, log
10:29 no_gravity Ok. Let's hope that's the only change.
10:29 osse you can even empty the reflog if you want
10:29 no_gravity Can one add a "commit message" to the reflog log? To annotate why it was reset?
10:29 bremner let it go man ;)
10:30 bremner no one but you should be looking at your reflog
10:30 bremner it's just for recovering from screwups.
10:30 osse no_gravity: i think so, but what's the point? no one else can see it
10:33 mar77i joined #git
10:33 xwcius joined #git
10:34 Kamilion joined #git
10:37 MineCoins joined #git
10:37 Cabanossi joined #git
10:38 zefferno joined #git
10:38 peacememories joined #git
10:40 wgrant joined #git
10:45 tvw joined #git
10:48 dendazen joined #git
10:49 glebihan joined #git
10:50 User458764 joined #git
10:50 glebihan_ joined #git
10:53 Chaser joined #git
10:53 BSaboia joined #git
10:53 tkilian2 quit
10:53 tkilian2 exit
10:57 Levex joined #git
10:58 al-damiri joined #git
10:59 Snugglebash joined #git
11:01 kexmex joined #git
11:01 JeroenT_ joined #git
11:03 roelmonn_ joined #git
11:07 atomi joined #git
11:08 mattp_ joined #git
11:10 thierryp joined #git
11:11 Gloomy joined #git
11:12 nd joined #git
11:13 Noodlewitt joined #git
11:14 lowercaseman joined #git
11:22 Zimoo joined #git
11:26 impermanence joined #git
11:27 glebihan joined #git
11:28 MineCoins joined #git
11:28 YuGiOhJCJ joined #git
11:30 a_thakur joined #git
11:31 jrm joined #git
11:31 Cavallari joined #git
11:32 tmsmith joined #git
11:32 learning joined #git
11:38 dsdeiz joined #git
11:38 hahuang61 joined #git
11:43 mkoskar joined #git
11:44 akrem joined #git
11:45 Tobbi joined #git
11:46 zxd having a .git repository in a sub directory of an existing repository is asking for trouble no?  like   maindir/.git   /maindir/subdir/.git    the Idea is I want to have two bare repositories and have a script clone the first then clone the other and move it to  subdir in the first repository , the subdir code is depandant on the main dir the structure of the dirs,   the idea is to have commits/and pushes only done from the subdir  reposi
11:46 zxd and have the maindir readonly
11:46 Eryn_1983_FL joined #git
11:47 Vampire0 zxd, !subr
11:47 gitinfo zxd: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
11:47 a_thakur joined #git
11:49 re1 joined #git
11:49 dec0n joined #git
11:50 a_thakur joined #git
11:51 JeroenT joined #git
11:52 jim_carry joined #git
11:52 zxd problem with subtree is that the second repository will become part of the main repository after git read-tree --prefix=subdir -u second_repository no ?
11:53 zxd so best option is indeed with .gitignore right?
11:53 jim_carry Is it advicable to keep gpg encrypted files on version control?
11:53 zxd and keep them completely seperately
11:53 bremner jim_carry: resolving conflicts is tricky. It depends on your workflow. For me it works ok with pass, but that avoids conflicts by design
11:54 sigdk joined #git
11:55 sigdk is "git checkout master && git merge hotfix" same as "git checkout hotfix && git merge master"?
11:55 grawity not exactly
11:56 jim_carry yes bremner thnx
11:56 grawity the end result might very well be the same, but Git remembers the order of branches when merging, so programs will draw the graph differently
11:56 grawity well, that's practically the only difference most of the time
11:56 synthroid joined #git
11:56 sigdk grawity, should I prefer one over the other?
11:57 theFallenAngel Hi isn't there any equivalent to `wget -c` command to deal with  internet problems while donwloading big files. Thank you for your consideration.
11:57 grawity depends on the reason for the merge
11:57 grawity ah, well, the second difference (should be obvious though) is which branch the merge ends up *in*
11:57 grawity just like commits, it's the currently checked out branch that gets updated
11:58 sigdk grawity, thanks for the info
12:01 modin joined #git
12:02 Vampire0 zxd, which approach you use heavily depends on your use-case. Please read up on the options and then decide what is the best solution for you. If it is the "just do it" solution, that's fine. :-)
12:03 Vampire0 theFallenAngel, what does this have to do with Git?
12:05 zxd why do git bare repositories have ./hooks dir? I can't commit/add anything from a bare repository can I ?
12:05 davimore__ joined #git
12:05 bremner you can push to it
12:06 bremner and you can probably commit it to it if you work hard enough
12:06 livingstn joined #git
12:09 Jackneill joined #git
12:09 desnudopenguino joined #git
12:09 rosiu joined #git
12:09 desnudopenguino good morning
12:10 desnudopenguino i just pulled from my repo to the live site to make some updates, but broke a bunch of stuff
12:10 canton7 !deploy
12:10 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
12:10 desnudopenguino ok
12:10 canton7 (in particular, using 'git pull' to deploy is asking for trouble, as a pull is an interactive operation which may conflict
12:11 desnudopenguino yeah
12:11 desnudopenguino i learned the hard way
12:11 desnudopenguino should I reset the live server's repo to the previous pull?
12:11 canton7 "a pull" isn't a thing, so I'm not sure exactly what you mean
12:11 canton7 you should probably reset it to something sensible, if that's a safe operation for you
12:12 desnudopenguino looking at the reflog
12:12 sigdk I have commited changes to my branch. Then I started doing changes that I want to commit to the master branch (I forgot to switch branch before editing the files). Now I try to switch and commit the files and it says "error: Your local changes to the following files would be overwritten by checkout:"  Any hint?
12:12 livingstn joined #git
12:12 desnudopenguino on the server all I see are "pull: Fast-forward"s
12:12 canoon joined #git
12:13 tobiasvl desnudopenguino: you should probably reset to the last pull (merge), if it worked then. depends why the most recent pull broke stuff. were there local changes which resulted in a conflict? resetting with --hard will throw those away, which you might not want
12:13 tobiasvl desnudopenguino: you kind of have to inspect the repo here to figure out what you want
12:14 Vampire0 sigdk, !flow
12:14 gitinfo sigdk: [!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow  See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references
12:14 Vampire0 sigdk, !flowt
12:14 Vampire0 hm, what was it
12:14 Vampire0 sigdk, !float
12:14 gitinfo sigdk: 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.
12:14 Vampire0 ah, there it is
12:14 desnudopenguino all of the changes are stored in other branches, I merged those locally and ran a local test
12:15 desnudopenguino then I pushed it to origin, then pulled from origin on live
12:15 desnudopenguino so on live if I step back one commit in the reflog, it should remove those things, right?
12:15 tobiasvl sure
12:16 theoceaniscool joined #git
12:16 tobiasvl desnudopenguino: also ORIG_HEAD probably points to the safe commit still
12:17 desnudopenguino hmm
12:19 ogny joined #git
12:19 tymczenko joined #git
12:19 amrits joined #git
12:19 desnudopenguino so I could do `git reset --hard ORIG_HEAD`?
12:20 impermanence joined #git
12:20 desnudopenguino meh, I already have the last commit on the server, I will just step back one
12:21 Levex joined #git
12:22 desnudopenguino alright done
12:22 theFallenAngel Vampire0 I am using  git and feel frustrated at any time the connection got lost
12:24 zxd is there a way maybe in one of hooks/ scripts to reject pushes that have no common ancestor, per example a push of a completely different repository...
12:24 codematt joined #git
12:26 sotoz joined #git
12:26 impermanence joined #git
12:30 pbrewczynski joined #git
12:31 theiostream joined #git
12:34 blackwind_123 joined #git
12:35 tobiasvl zxd: you mean block those, even with --force?
12:36 zxd tobiasvl: yes
12:36 tobiasvl zxd: you can probably just set config.receive.denyNonFastForwards true
12:37 tobiasvl but yes, it can also be done with a hook that rejects non-fast-forwards
12:37 zxd but that shouldn't be enouth
12:37 robotroll joined #git
12:37 tobiasvl it shouldn't?
12:38 zxd there could be a commit that was branched from another but still won't fast forward
12:38 mda1 joined #git
12:38 tobiasvl OK, so you don't want to reject all non-ff, just those with no common ancestor at all?
12:38 tobiasvl sorry, misread then
12:38 kpease joined #git
12:38 zxd but still it has common ancestry no ? before the creation of a new branch
12:39 morfin joined #git
12:39 morfin hello
12:39 zxd tobiasvl: yes
12:39 morfin you can cherry-pick several commits using reflog?
12:39 zxd tobiasvl: like completly different histories no common history at all
12:39 tobiasvl morfin: sure
12:42 morfin i am not pretty sure how cherry pick range from reflog hmm
12:43 sigdk Vampire0, I did a branch. Then a change-commit something at the end of file "foo". Now I started changing again file foo at the start of it (haven't committed yet) and I want these changes to go to the foo of the master... I understand, this doesn't sound rational, but what is the best way to do that? The only I can think is undo all current changes, switch to master and apply all there
12:43 tobiasvl zxd: then you can write a hook, yes. pretty easy, just check if "git merge-base branch1 branch2" returns 0 or not
12:44 rolha joined #git
12:44 rolha left #git
12:44 morfin i tried git cherry-pick HEAD@{2}..HEAD@{3} but it selected only one commit for some reason
12:44 buffal0 joined #git
12:45 Silenced joined #git
12:46 pinkkis joined #git
12:46 zxd tobiasvl: in pre-receive Hook ?
12:46 PtxDK joined #git
12:46 tobiasvl zxd: yes, or update
12:47 MrMojit0 joined #git
12:47 morfin maybe i had to do git cherry-pick HEAD@{2}^..HEAD{3}?
12:48 a_thakur joined #git
12:48 knobo left #git
12:50 karols146 joined #git
12:51 XenophonF joined #git
12:51 tobiasvl morfin: or HEAD@{2}...HEAD@{3} ?
12:52 rwb joined #git
12:52 morfin no
12:53 morfin HEAD@{3}^..HEAD@{2}
12:53 sigdk how can I discard all current changes I did to a file? I haven
12:53 sigdk I haven
12:53 tobiasvl soooo the same as HEAD@{4}..HEAD@{2} then?
12:53 sigdk I haven't changed/commited anything
12:53 _Vi joined #git
12:53 _ikke_ sigdk: git chkecout <file>
12:54 sigdk _ikke_, this will revert the state of the file right after my latest commit, correct? (on the current branch)
12:54 _ikke_ yes
12:55 tapout joined #git
12:55 _ikke_ it will update the file to the state in the last commit
12:55 morfin yes same as HEAD@{4}..HEAD@{2}
12:56 morfin i did not expect that cherry-pick does not include first commit in range unless you use ^
12:56 nostrora joined #git
12:56 courrier joined #git
12:56 nostrora Can we start an [precommit script] with git ? before commit i want to launch a script, and this script have to be able to cancel the commit
12:57 raijin joined #git
12:57 _ikke_ yes, see man githooks (pre-commit hook)
12:57 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
12:57 Gsham joined #git
12:57 nostrora _ikke_: Thanks
12:58 Vampire0 sigdk, I already gave you the answer: !float
12:58 gitinfo sigdk: 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.
12:58 guardian joined #git
12:59 tobiasvl morfin: that's due to the usage of .. not cherry-pick itself. that's why I asked if you needed ... instead
12:59 marcogmonteiro joined #git
13:00 hvxgr joined #git
13:01 miczac joined #git
13:02 dave0x6d joined #git
13:02 Murii joined #git
13:08 Lunatrius joined #git
13:08 jeffreylevesque joined #git
13:11 Oatmeal joined #git
13:11 Ryanar joined #git
13:11 User458764 joined #git
13:11 DarkPsydeLord joined #git
13:13 Andrew_K|2 joined #git
13:16 spica joined #git
13:18 publio joined #git
13:18 Silenced joined #git
13:25 davimore joined #git
13:25 fahadash joined #git
13:25 Gsham joined #git
13:26 kbeflo joined #git
13:26 delboy1978uk joined #git
13:27 delboy1978uk how do i say use my version of a file during a merge conflict?
13:28 Ploppz left #git
13:28 delboy1978uk ah found it
13:28 delboy1978uk git checkout --ours
13:28 alexandre9099 joined #git
13:29 osse delboy1978uk: warning: that will use your file even in the parts of the file where there was no conflict and git managed to merge the two versions
13:29 bitmod joined #git
13:29 Zimoo joined #git
13:29 Karazhan joined #git
13:33 learning joined #git
13:34 livingstn joined #git
13:34 basiclaser joined #git
13:35 delboy1978uk osse: it's ok, some smartass thought it'd be a good idea to put PHP Composers vendor folder into git, i just had to get a non conflicting version of the file so i could run composer update and commit the merge
13:38 Karazhan joined #git
13:39 hahuang61 joined #git
13:41 MineCoins joined #git
13:43 livingstn joined #git
13:44 prg318 joined #git
13:44 davimore_ joined #git
13:45 oleo joined #git
13:47 a_thakur joined #git
13:47 Dougie187 joined #git
13:48 livingstn joined #git
13:49 thebope joined #git
13:52 Cabanossi joined #git
13:53 karols146 joined #git
13:54 davimore joined #git
13:56 notebox joined #git
13:56 kbeflo_ joined #git
13:58 Zimoo left #git
13:59 bannakaffalatta joined #git
14:00 lavalamp joined #git
14:00 qqx joined #git
14:04 JeroenT_ joined #git
14:04 JeroenT_ joined #git
14:04 crose joined #git
14:04 rmfnqo joined #git
14:05 delboy1978uk left #git
14:05 Es0teric joined #git
14:06 Kaisyu joined #git
14:10 LeBlaaanc joined #git
14:10 kbs joined #git
14:14 TbobbyZ joined #git
14:14 overlord_tm joined #git
14:17 shinnya joined #git
14:18 miczac joined #git
14:18 bannakaf_ joined #git
14:19 User458764 joined #git
14:19 AaronMT joined #git
14:21 getxsick joined #git
14:23 Levex joined #git
14:27 mchelen2 joined #git
14:27 mchelen2 is it possible to set up different http.sslKey for different domains in my ~/.gitconfig?
14:28 mchelen2 i know i can set it locally in a repo, but that only works after i've cloned the repo
14:29 _ikke_ mchelen2: Not that I'm aware of
14:29 cdg joined #git
14:29 _ikke_ note that you can do git -c http.sslKey=... clone <url>
14:30 mchelen2 _ikke_: oh yeah good point, that's probably good enough
14:31 tr0picana joined #git
14:31 mchelen2 ty
14:32 thallada joined #git
14:33 imack joined #git
14:35 orbyt_ joined #git
14:37 thallada joined #git
14:37 tr0picana left #git
14:38 __rgn left #git
14:38 peepsalot joined #git
14:39 CheckDavid joined #git
14:39 Vampire0 mchelen2, but be aware that it will only be in effect for that one call. You still need to set it on the clone then to persist it
14:40 nowhere_man joined #git
14:44 fieldmapper joined #git
14:45 kadoban joined #git
14:46 miczac joined #git
14:48 PaulCapestany joined #git
14:48 Sleepy63 joined #git
14:48 _ng joined #git
14:50 dddaviddd joined #git
14:50 dddaviddd joined #git
14:53 tlaxkit joined #git
14:53 nowhereman joined #git
14:54 davimore joined #git
14:54 NeverDie joined #git
14:54 Ovsyanka joined #git
14:55 kbs joined #git
14:55 ResidentBiscuit joined #git
14:57 imack joined #git
14:58 astrofog joined #git
14:59 HoierM joined #git
15:00 nowhereman joined #git
15:02 menip joined #git
15:02 Skyfinn joined #git
15:05 qqx joined #git
15:06 roelmonnens joined #git
15:07 h12o joined #git
15:07 roelmonnens joined #git
15:07 theiostr_ joined #git
15:07 qqx mchelen2: You can use settings like http.https://github.com.sslKey to specify a key for specific domains.
15:08 qqx This is covered under the "http.<url>.*" section of man git-config.
15:08 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
15:12 marianina8 joined #git
15:13 eosi joined #git
15:13 pbrewczynski joined #git
15:16 kbs joined #git
15:19 Es0teric joined #git
15:20 z8z joined #git
15:21 MineCoins joined #git
15:22 mda1 joined #git
15:23 VladGh joined #git
15:23 Gustavo6046 joined #git
15:26 rominronin joined #git
15:27 thiago joined #git
15:28 nowhere_man joined #git
15:29 morfin hm
15:30 LionsMane joined #git
15:32 jagob joined #git
15:32 todd_dsm joined #git
15:33 GT joined #git
15:34 learning joined #git
15:34 oomemusss joined #git
15:37 thebope joined #git
15:38 apotry joined #git
15:39 PettanShoutaKin joined #git
15:40 PettanShoutaKin is there a way to turn the commits on my branch (excluding merge commits) into a patch I can apply to a fork repos master?
15:40 Levex joined #git
15:40 hahuang61 joined #git
15:41 elsevero joined #git
15:41 VladGh joined #git
15:42 Vampire0 PettanShoutaKin, you can use man git format-patch and then man git am on the fork. But you could also simply add your repo as remote to the fork and then use normal git operations like rebase or cherry-pick in the fork repo
15:42 gitinfo PettanShoutaKin: the git-format-patch manpage is available at http://jk.gs/git-format-patch.html
15:42 gitinfo PettanShoutaKin: the git-am manpage is available at http://jk.gs/git-am.html
15:42 PettanShoutaKin I could cherry pick the commits but I'm worried there will be a lot of them
15:43 miczac joined #git
15:44 regedit joined #git
15:44 PettanShoutaKin I'll give it a shot though and see how it works out, thank you!
15:44 Vampire0 PettanShoutaKin, you can give cherry-pick a range, you don't need to pick each commit individually
15:44 Vampire0 PettanShoutaKin, or you use an interactive rebase
15:45 Vampire0 PettanShoutaKin, or maybe even non-interactive
15:45 PettanShoutaKin how would I do that with an interactive rebase, at least in theory?
15:46 Vampire0 PettanShoutaKin, maybe e. g. `git rebase --onto fork-branch from-commit-exclusive to-commit-inclusive` or something like that
15:46 Vampire0 PettanShoutaKin, I'm not sure whether there merge commits would be excluded or not. If they are not, use interactive rebase, there I'm sure merge commits are omitted if not explicitly included
15:47 govg joined #git
15:47 Vampire0 PettanShoutaKin, or if you want to select which of the commits to pick and which not, you can also do it interactively and then work through the list before starting the rebase
15:48 DarkPsydeLord joined #git
15:49 r0siu joined #git
15:50 orbyt_ joined #git
15:50 User458764 joined #git
15:51 permalac joined #git
15:51 mmlb joined #git
15:51 User458764 joined #git
15:52 permalac joined #git
15:52 svm_invictvs joined #git
15:54 dreiss joined #git
15:55 miczac joined #git
15:57 h12o joined #git
15:57 drodger joined #git
15:57 sostenuto joined #git
15:58 tristanp joined #git
15:58 marianina8 joined #git
15:58 ResidentBiscuit joined #git
15:59 Nilesh_ joined #git
15:59 morfin sometimes i do strange things
16:00 marcogmonteiro joined #git
16:00 morfin like reset --hard then pull and cherry-pick commit(s) using hash/reflog
16:01 jagob joined #git
16:03 Tobbi joined #git
16:05 tlaxkit joined #git
16:05 Gloomy joined #git
16:05 Es0teric joined #git
16:08 morfin th
16:08 s1scha joined #git
16:09 morfin but i usually avoid rebase
16:09 morfin because last time i had some serious issues with it
16:10 madewokherd joined #git
16:11 chitopunk joined #git
16:11 MillerBoss joined #git
16:11 boombatower joined #git
16:13 durham joined #git
16:15 s1scha joined #git
16:15 drodger joined #git
16:17 h12o joined #git
16:18 justan0theruser joined #git
16:19 mchelen2 qqx: oh cool, i didn't know about that
16:19 metachr0n joined #git
16:20 hvxgr joined #git
16:21 drodger joined #git
16:21 strk joined #git
16:21 TikityTik joined #git
16:21 nitric joined #git
16:22 bitmod joined #git
16:22 strk I read in contrib/hooks/post-receive-email about "Config", but it isn't clear to me where the configuration goes. Is it in the .git/config file ?
16:22 sz0 joined #git
16:22 orbyt_ joined #git
16:23 canton7 strk, yes (or ~/.gitconfig, etc)
16:24 canton7 (also note that comment which says that post-receive-email is unmaintained, and to look at multimail)
16:26 strk uhm, I dont' have that comment in there
16:26 strk must be too old :)
16:26 strk (C) 2007
16:27 tyreld joined #git
16:27 learning joined #git
16:28 canton7 strk, https://github.com/git/git/blob/master/contrib/hooks/post-receive-email#L7
16:28 canton7 that comment's been there for 4 years
16:28 canton7 so, 1.8.4
16:29 ayogi joined #git
16:29 PettanShoutaKin how do I cherry pick a range of commits?
16:30 strk we have an old git installed
16:30 strk 1.7.10.4 looks like
16:31 morfin PettanShoutaKin, git cherry-pick first_hash^..second_hash
16:32 morfin if you don't include ^ you should use hash of commit before first commit you need to include
16:33 PettanShoutaKin thank you sir!
16:35 InfoTest joined #git
16:35 nowhere_man joined #git
16:36 guardian joined #git
16:37 theiostream joined #git
16:37 tang^ joined #git
16:37 Cabanossi joined #git
16:40 svm_invictvs joined #git
16:40 atomi_ joined #git
16:42 _ng joined #git
16:42 yogendra joined #git
16:45 muldover joined #git
16:46 muldover joined #git
16:48 h12o joined #git
16:49 kexmex joined #git
16:53 hahuang61 joined #git
16:53 acetakwas joined #git
16:55 zerow joined #git
16:57 livingstn joined #git
16:58 Gloomy joined #git
16:58 kfoonamalik joined #git
16:58 paul424 joined #git
16:58 zerow_ joined #git
16:58 h12o joined #git
16:59 miczac joined #git
17:00 hahuang65 joined #git
17:02 spica joined #git
17:02 gopar joined #git
17:02 Tobbi joined #git
17:03 dglambert joined #git
17:03 dglambert yo
17:06 basiclaser joined #git
17:07 Pursuit joined #git
17:07 Cabanossi joined #git
17:09 gugah joined #git
17:09 oleo joined #git
17:09 gugah joined #git
17:11 gugah joined #git
17:12 gugah joined #git
17:12 Guest55 joined #git
17:13 matoro joined #git
17:13 freimatz joined #git
17:15 learning joined #git
17:16 mostlybadfly joined #git
17:16 meZee joined #git
17:18 jokajak joined #git
17:18 h12o joined #git
17:18 xintron joined #git
17:19 xintron Is there a way to get a better parseable format for diff --shortstat? Like "<inserts> <deletes>" separated with space?
17:19 dreiss joined #git
17:19 xintron Possible to use the current format with awk but asking before I go with the awk solution :)
17:25 Es0teric joined #git
17:29 h12o joined #git
17:31 elisa87 left #git
17:33 bruce_lee joined #git
17:33 bruce_lee joined #git
17:34 synthroi_ joined #git
17:35 thiago joined #git
17:39 joshszep joined #git
17:40 gtristan joined #git
17:41 Rodya_ joined #git
17:42 learning joined #git
17:43 chris349 joined #git
17:43 gopar joined #git
17:44 gopar joined #git
17:46 _ikke_ xintron: what about --numstat
17:46 aielima joined #git
17:46 ExoUNX joined #git
17:47 eihabarabia joined #git
17:47 pdgwien joined #git
17:53 brk_ joined #git
17:54 pdgwien joined #git
17:54 finalbeta joined #git
17:55 synthroid joined #git
17:56 matoro joined #git
17:57 Umj joined #git
17:57 nixjdm joined #git
17:59 duderonomy joined #git
17:59 h12o joined #git
18:02 karols146 joined #git
18:03 diogenese joined #git
18:06 theiostream joined #git
18:07 marianina8 joined #git
18:07 zerow joined #git
18:07 pdgwien joined #git
18:09 gopar joined #git
18:09 g105b joined #git
18:10 howlinbash joined #git
18:12 ertesx joined #git
18:12 bgerber joined #git
18:12 mpeter joined #git
18:13 hahuang65 joined #git
18:14 howlinbash hi #git, i'm setting up a simple jekyll blog. because jekyll just renders markdown files as simple html pages all my posts will be simple markdown files in a directory. I would like to have that directory "_posts" as it's own git repo. would submodules be the best way to do that or is there a better practice. thanks
18:14 Sasazuka_ joined #git
18:15 thebope joined #git
18:16 Es0teric joined #git
18:17 prg3 joined #git
18:19 bgerber joined #git
18:19 h12o joined #git
18:20 borkr joined #git
18:20 Vampire0 howlinbash, !supre
18:20 Vampire0 howlinbash, !subre
18:20 gitinfo howlinbash: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
18:20 Levex joined #git
18:23 bgerber joined #git
18:23 oleo joined #git
18:24 howlinbash gitinfo, thanks. I wasn't aware of slave and subtree (and didn't think of gitignore) i'll check them out. thanks
18:24 gitinfo howlinbash: you're welcome, but please note that I'm a bot. I'm not programmed to care.
18:25 howlinbash hahahaha
18:25 pdgwien joined #git
18:27 orbyt_ joined #git
18:27 theiostream joined #git
18:28 warthog9 joined #git
18:29 a3Dman joined #git
18:30 h12o joined #git
18:30 bgerber joined #git
18:31 manuelschneid3r joined #git
18:31 notebox joined #git
18:32 ski7777 joined #git
18:33 ethali joined #git
18:34 TSS_ joined #git
18:35 ethali_ joined #git
18:35 Andrew_K|2 joined #git
18:36 theoceaniscool joined #git
18:36 oskarkv joined #git
18:37 xpk joined #git
18:37 theiostr_ joined #git
18:37 xpk joined #git
18:38 a3Dman joined #git
18:39 MrWoohoo joined #git
18:41 rivarun_ joined #git
18:41 mozzarel1 joined #git
18:41 gr_wity joined #git
18:41 JanC_ joined #git
18:41 MrMojit0 joined #git
18:41 aboccia joined #git
18:41 WakiMiko joined #git
18:41 borkr joined #git
18:42 kexmex joined #git
18:43 yanome joined #git
18:43 Rodya_ joined #git
18:43 ToxicFrog joined #git
18:43 pdgwien joined #git
18:45 finalbeta joined #git
18:46 mmh joined #git
18:50 ahrs joined #git
18:51 Levex joined #git
18:51 raijin joined #git
18:52 Cabanossi joined #git
18:53 vrishab joined #git
18:55 prg3 joined #git
18:55 ash_workz what would cause `git status` to take an eternity when run on a remote server?
18:56 ash_workz it just hangs
18:57 grawity disk problems, NFS problems, kernel problems
18:57 grawity plenty of things -- use strace -ff and other debugging tools to find out
18:58 mda1 joined #git
18:59 livingstn joined #git
19:00 h12o joined #git
19:02 Andrew_K joined #git
19:03 Darcidride joined #git
19:03 thiago joined #git
19:05 z8z joined #git
19:07 livingstn joined #git
19:07 ash_workz grawity: it is apparently going through a ton of captcha files; is there anyway to ignore that? (adding .gitignore to the dir doesn't seem to prevent that)
19:07 nidr0x joined #git
19:08 drodger joined #git
19:08 grawity try gitignoring the entire dir (not just "*") from the parent directory
19:08 Rodya_ joined #git
19:09 thebope joined #git
19:11 jstimm joined #git
19:12 ash_workz grawity: yeah that worked; but `git status` shows unfamiliar output
19:12 Cavallari joined #git
19:12 grawity such as?
19:13 n3wborn left #git
19:13 Rodya_ joined #git
19:14 ioprev joined #git
19:14 ash_workz grawity: it shows a bunch of files with a leading #; I was thinking I'd see files that are untracked or staged, but I don't even see those descriptions
19:16 ash_workz eh; w/e I realized I'm walking down the wrong road anyway
19:16 TomyLobo2 joined #git
19:19 Discovery joined #git
19:20 h12o joined #git
19:22 TomyLobo joined #git
19:22 ash_workz how do I see changes between local and remote branches?
19:22 ash_workz s/changes/differences
19:22 moei joined #git
19:23 grayjoc joined #git
19:24 ash_workz hmm... maybe I'm not asking the right question; when I try to push, it says 'Updates were rejected because the remote contains work that you do not have locally.'
19:28 LionsMane joined #git
19:30 sunri5e joined #git
19:30 abra0 joined #git
19:31 grawity git fetch; $TOOL ..@{upstream}
19:31 grawity for TOOL in "tig", "gitk", "git log --graph --oneline --decorate"
19:31 matoro joined #git
19:33 codemann joined #git
19:34 ethali joined #git
19:35 chris3492 joined #git
19:37 luke_nukem joined #git
19:40 dvaske joined #git
19:40 paul424 joined #git
19:40 h12o joined #git
19:41 myhau joined #git
19:42 govg joined #git
19:42 CheckDavid joined #git
19:44 esauceda joined #git
19:48 esauceda left #git
19:51 raijin joined #git
19:52 finalbeta joined #git
19:53 Acerific joined #git
19:53 Acerific joined #git
20:00 hahuang61 joined #git
20:01 h12o joined #git
20:02 mopar1 joined #git
20:03 _Vi joined #git
20:03 thebope joined #git
20:05 m0viefreak joined #git
20:05 dviola joined #git
20:05 hvxgr joined #git
20:06 jstein_ joined #git
20:08 Rodya_ joined #git
20:08 mopar1 joined #git
20:09 orbyt_ joined #git
20:10 LionsMane joined #git
20:11 wizardedit joined #git
20:11 wizardedit joined #git
20:12 Sasazuka joined #git
20:18 robattila256 joined #git
20:18 Guest55 joined #git
20:18 sea-gull joined #git
20:21 cdg joined #git
20:21 h12o joined #git
20:23 ruby joined #git
20:23 gopar joined #git
20:24 strk left #git
20:24 aielima joined #git
20:25 exotime joined #git
20:25 raijin joined #git
20:28 Rodya_ joined #git
20:28 foreal joined #git
20:28 afuentes joined #git
20:33 ZyX-I joined #git
20:37 Rodya_ joined #git
20:38 ZyX-I Hello. If you were asked to `rebase --interactive` to squash some commits *without* actually rebasing (most recent common ancestor with rebase target should not be altered) what would you do? I used rather lengthy alias, but after rereading documentation it looks like I could’ve used `git rebase --onto master master` (still via a lengthy alias, but less lengthy as with explicit `git merge-base` usage) a
20:38 ZyX-I s well.
20:39 Gloomy joined #git
20:40 Es0teric joined #git
20:41 raijin joined #git
20:41 h12o joined #git
20:42 gunnaro joined #git
20:44 selckin git rebase -i <last-upstream-commit>
20:44 selckin and squash ?
20:44 drodger joined #git
20:44 dglambert joined #git
20:45 chitopunk1 joined #git
20:47 ZyX-I selckin: It is going to move most common ancestor. My alias is basically doing `git rebase -i $(git merge-base upstream feature)`.
20:48 ZyX-I With some additional handling: !zsh -c 'git rebase --interactive $(git merge-base --is-ancestor ${1:-master} ${2:-HEAD} && git rev-parse ${1:-master} || git merge-base ${1:-master} ${2:-HEAD}) ${@[3,-1]}' -
20:49 anuxivm joined #git
20:49 selckin can't see why you'd need such advanced stuff, just run log and copy paste a sha
20:50 tymczenko joined #git
20:51 ZyX-I selckin: I am not going to do this each time I need to rebase --interactive.
20:51 Rodya_ joined #git
20:52 selckin if you don't even remember the commits you just worked on, then what are you doing
20:52 ZyX-I selckin: This alias is being used *every* time I need interactive rebase: I want to *edit history*, I do not want to *rebase* anything.
20:53 selckin log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
20:55 ZyX-I selckin: It is much easier to use `git ri` (my alias) then to count how many `^` I need to edit the history, or remember the sha, or whatever. It is automatic, *no* action required from my side *at all*. Please do not suggest me peeking into (ref)log, remembering anything or whatever.
20:55 selckin i have no idea what your question is
20:55 selckin except you're making something simple difficult imo, but i'll be quiet now
20:56 grawity did you basically come here to brag about your mad scripting skills
20:56 ZyX-I selckin: I want to edit history, with rebase --interactive. I do not want to rebase. If you worked with mercurial you may recognize `hg histedit`.
20:57 giovaevale89 joined #git
20:57 sunri5e joined #git
20:57 ZyX-I grawity: I came here to find easier solution then what I am using already. Because this alias is going to be suggested as the recommended alias used for rebase --interactive (and then merging), I want something simpler.
20:58 thebope joined #git
20:58 prg3 joined #git
20:58 ZyX-I * suggested in the project I am working on
20:59 ZyX-I I.e. there is a possible move from rebase-based workflow to no-rebase merge-based, but we want to provide contributors an easy way to edit commits between merges.
20:59 Guest55 joined #git
21:00 aidalgol joined #git
21:02 h12o joined #git
21:07 cjohnson you can't edit history and merge, you'll end up with multiple commits that do the same thing
21:08 peterbecich joined #git
21:08 ZyX-I cjohnson: Only editing history before the merge, after the last merge (or when PR branched). Not between.
21:09 ZyX-I cjohnson: And PR is in any case a single ref.
21:10 LionsMane joined #git
21:11 Ryanar joined #git
21:11 dglambert joined #git
21:11 ZyX-I cjohnson: So theoretically you can edit history before the merge, creating new merge commit which does basically the same thing if you do this with some restrictions. But I doubt git would handle such request and not going to ask for implementing that.
21:12 Tobbi joined #git
21:12 guardian hello, is there a way to make ident inject the branch name when not in detached HEAD?
21:13 elsevero joined #git
21:13 jeffreylevesque joined #git
21:13 selckin ident?
21:14 theiostream joined #git
21:15 theiostr_ joined #git
21:15 jost_ joined #git
21:16 aw1 joined #git
21:17 Rodya_ joined #git
21:18 ZyX-I --onto is not helpful, still rebases. And when translating my alias to POSIX sh it became `ri = "!sh -c 't=\"${1:-master}\"; s=\"${2:-HEAD}\" ; [ $# -gt 0 ] && shift ; [ $# -gt 0 ] && shift ; git rebase --interactive \"$(git merge-base --is-ancestor \"$t\" \"$s\" && git rev-parse \"$t\" || git merge-base \"$t\" \"$s\")\" \"$@\"' -"`, not good.
21:19 Atm0spher1c joined #git
21:22 Rodya_ joined #git
21:22 h12o joined #git
21:22 avar I started writing up a gitperformance(7) manpage which'll serve as an overview of various ways to improve git's performance. Suggestions for topics to cover welcome: https://public-inbox.org/git/20170403211644.26814-1-avarab@gmail.com/T/#u
21:23 avar I listed some in the RFC e-mail, but I'm surely missing a lot
21:23 ZyX-I This looks like a bug: `git rebase --onto ..master feature` complains that it is needing a single commit, yet `git merge-base --all HEAD master` reports only one commit. Though even if this worked I guess this is not going to be helpful: after the first merge there will be more then one merge-base, will not it?
21:24 avar merge-base takes two refs, which you're giving it, but you're feeding git-rebase with HEAD..master feature, which is lots of commits..
21:25 ZyX-I avar: According to the help, A..B in --onto is a special case, basically an alias to using merge-base.
21:25 theoceaniscool joined #git
21:25 ZyX-I > As a special case, you may use "A...B" as a shortcut for the merge base of A and B if there is
21:25 ZyX-I exactly one merge base. You can leave out at most one of A and B, in which case it defaults to
21:25 ZyX-I HEAD.
21:26 ZyX-I This is for 2.10.2.
21:26 Rodya_ joined #git
21:26 cjohnson ZyX-I: the problem is, editing history is problematic not based on merges, but pushes
21:26 ZyX-I Not most recent git version, but most recent Gentoo stable git version.
21:26 cjohnson which don't really create a trackable trail
21:27 cjohnson afaik there's no way to know when the last pushed commit was
21:27 cjohnson maybe via origin but I'm thinking in team branches even that won't be helpful
21:27 cjohnson you can do some guessing but nothin explicit
21:27 cjohnson and that's the issue, rewriting already-pushed history
21:27 ZyX-I cjohnson: We are not going to require immutable history or make contributors track phases by themselves. Just making sure that commits will stay consistent.
21:28 slobber joined #git
21:28 hvxgr joined #git
21:28 cjohnson that's what I'm saying is an issue, by letting people rewrite history without really knowing what's going on underneath (since you are writing their git commands for them) you are opening yourself up to headache
21:28 slobber if i have a name of a PR (e.g. PR-37), how can i get a list of files changed in it via command line?
21:28 j416 avar: cool.
21:29 cjohnson easier to just teach people how to use git
21:29 cjohnson imo anyway
21:30 cjohnson slobber: does github offer a command line API? I didn't think they did
21:30 grawity slobber: depends on where the PR is hosted – Github?
21:30 slobber yeah, grawity
21:30 grawity some offer PRs as fetchable refs/branches
21:30 Guest55 joined #git
21:30 livingstn joined #git
21:30 cjohnson oh neat
21:30 slobber i think github does, yeah
21:30 cjohnson is it just bundled right into the git repo? or something extra
21:30 grawity git fetch origin refs/pull/37/head && git diff --stat master..FETCH_HEAD
21:30 miczac joined #git
21:30 slobber but i'm having trouble putting that together
21:30 JanC_ joined #git
21:31 pietv joined #git
21:31 zerow joined #git
21:31 grawity git config --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/pull/*" && git fetch origin && git diff --stat master..pull/37
21:31 slobber crap, grawity, that was it
21:32 ZyX-I cjohnson: It is possible to check that `git merge-base --all` is not only appended to as PR progresses. What is between HEAD of the PR and merge bases is the contributor responsibility, but with `ri` it is going to be something more or less sane and consistent. At least it would not appear that some of the middle commits is using a function which was renamed in master if contributor at least compiles his
21:32 ZyX-I code: it will either have old master with that function or new master, but after the merge.
21:32 slobber thank you!
21:32 ZyX-I * s/is not only appended/is only appended/
21:33 buzzLightBeer joined #git
21:35 kadobanana joined #git
21:35 nitric_ joined #git
21:37 Cabanossi joined #git
21:38 matoro joined #git
21:39 Rodya_ joined #git
21:39 dsdeiz joined #git
21:39 dsdeiz joined #git
21:40 dtrott joined #git
21:41 tmg joined #git
21:42 masuberu joined #git
21:42 h12o joined #git
21:42 ZyX-I Apparently “is only appended to” does not work.
21:46 slobber grawity: damn, it worked on my pooter but the same exact thing won't do on jenkins.
21:46 ZyX-I This feature is for different purpose. To check what I want automatically will need to somehow enumerate commits which GH thinks are in PR and compute merge-base for all of them in order. *That* should only be appended to.
21:46 slobber basically, i'm using the multibranch plugin, and it reports the PR name, but it seems to have quirks where this doesn't work..
21:46 slobber fatal: ambiguous argument 'master..pull/35': unknown revision or path not in the working tree.
21:50 Tobbi joined #git
21:51 Anja_ joined #git
21:52 thebope joined #git
21:54 prg3 joined #git
21:57 slobber joined #git
22:00 kexmex joined #git
22:01 hahuang61 joined #git
22:03 h12o joined #git
22:03 Aepo joined #git
22:04 Dougie187 left #git
22:06 blackwind_123 joined #git
22:06 masuberu joined #git
22:07 p4trix joined #git
22:08 howitdo joined #git
22:09 venmx joined #git
22:11 thierryp joined #git
22:12 z4kst4r joined #git
22:13 hvxgr joined #git
22:14 nitric joined #git
22:14 z4kst4r Hi all, I am new to git. I am trying to get the SHA-1s from my git log however, `git log' does not show it. The out put I get is this https://ptpb.pw/1N3e
22:15 z4kst4r How do I make it get SHA-1s?
22:19 mmattice z4kst4r: --no-abbrev-commit
22:19 cliluw joined #git
22:20 askb joined #git
22:20 z4kst4r mmattice: thanks
22:20 kbs what am I missing :-) isn't that already the full sha-1 of the commit?
22:20 mmattice z4kst4r: those 40 character hashes are the full hash already though.
22:21 alexandre9099 joined #git
22:24 bannakaffalatta joined #git
22:26 mikecmpbll joined #git
22:26 aax joined #git
22:29 raijin joined #git
22:29 livingstn joined #git
22:35 onmeac joined #git
22:36 dsdeiz_ joined #git
22:36 anuxivm joined #git
22:38 Cabanossi joined #git
22:40 rwb joined #git
22:43 madewokherd joined #git
22:46 thebope joined #git
22:48 dendazen joined #git
22:51 alexggordon joined #git
22:53 publio joined #git
22:57 mizu_no_oto joined #git
22:58 Ryanar joined #git
23:00 regedit joined #git
23:02 aw1 joined #git
23:03 h12o joined #git
23:04 Es0teric_ joined #git
23:04 kyan joined #git
23:05 justanotheruser joined #git
23:06 sunri5e joined #git
23:06 drodger joined #git
23:08 raijin joined #git
23:08 anuxivm left #git
23:08 lavalamp joined #git
23:09 tmg_ joined #git
23:11 roelmonnens joined #git
23:12 Achylles joined #git
23:16 jnewt__ joined #git
23:21 matoro joined #git
23:24 prg3 joined #git
23:25 re1 joined #git
23:26 masuberu joined #git
23:27 Es0teri__ joined #git
23:32 ToBeFree joined #git
23:33 drodger joined #git
23:35 peterbecich joined #git
23:39 skered joined #git
23:39 VladGh joined #git
23:39 drodger joined #git
23:40 thebope joined #git
23:40 bwn joined #git
23:44 Noodlewitt joined #git
23:45 dsantiago joined #git
23:47 drodger joined #git
23:52 safe joined #git
23:56 a_thakur joined #git
23:56 jnewt_ joined #git

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