1 2017-11-25 08:01:33	0|bitcoin-git|[13bitcoin] 15aaron-hanson opened pull request #11765: [REST] added blockhash api, tests and documentation (06master...06rest-blockhash-endpoint) 02https://github.com/bitcoin/bitcoin/pull/11765
 2 2017-11-25 19:46:13	0|Lauda|I did [insertUselessPapers]
 3 2017-11-25 19:46:16	0|Lauda|oops
 4 2017-11-25 20:41:56	0|archaeal|when adding commits to an open pull request, is the convention to squash them and force push, or keep them separate?  I noticed the contributing readme mentions squashing before a merge to master, but I'm wondering about before that?
 5 2017-11-25 20:43:32	0|promag|archaeal: usually it depends
 6 2017-11-25 20:43:46	0|promag|if you already have reviews, maybe push a new commit
 7 2017-11-25 20:44:13	0|archaeal|makes sense...  thanks!
 8 2017-11-25 20:44:27	0|promag|also, see git commit --fixup
 9 2017-11-25 20:45:03	0|promag|it helps later when squashing if your PR has multiple commits and multiple fixups
10 2017-11-25 20:45:53	0|promag|usually I do git remote update origin && git rebase  with origin/master when squashing
11 2017-11-25 20:46:11	0|promag|git rebase -i --autosquash origin/master
12 2017-11-25 20:46:21	0|archaeal|yeah i generally use fixup when squashing
13 2017-11-25 20:46:42	0|sipa|also, even if you squash, avoid rebasing until necessary
14 2017-11-25 20:47:15	0|archaeal|ok thanks
15 2017-11-25 20:47:16	0|sipa|it helps review if people can look at the diff between your new pr overall and the old version, without it being cluttered with changes from master
16 2017-11-25 20:47:25	0|archaeal|ah yes
17 2017-11-25 20:47:41	0|sipa|for simple PRs i generally don't care about squashing liberally
18 2017-11-25 20:48:39	0|promag|sipa: how do you diff with old version?
19 2017-11-25 20:48:58	0|sipa|git diff <commit> <commit>
20 2017-11-25 20:49:51	0|promag|how do you know the 1st commit?
21 2017-11-25 20:50:42	0|promag|especially in the case I push -f
22 2017-11-25 20:51:33	0|meshcollider|promag: you have to have checked out the branch locally first I think?
23 2017-11-25 20:51:44	0|sipa|promag: it's the one you acked before
24 2017-11-25 20:52:48	0|meshcollider|GitHub doesn't store commits which were overwritten with -f does it
25 2017-11-25 20:53:38	0|sipa|not for long, but you can easily pull them locally
26 2017-11-25 20:53:54	0|sipa|by adding the pulls branch to your remote
27 2017-11-25 20:54:09	0|sipa|that way you always have all commits locally from all prs
28 2017-11-25 20:55:11	0|promag|but I have to remote update all remotes right?
29 2017-11-25 20:58:28	0|sipa|i always use git fetch -a
30 2017-11-25 21:02:34	0|wxss|sipa, do you mean git fetch --all? Does that do the same as git remote update?
31 2017-11-25 21:04:44	0|sipa|-a is the same as --all
32 2017-11-25 21:05:29	0|wxss|git help fetch says -a is --append
33 2017-11-25 21:06:57	0|sipa|heh!
34 2017-11-25 21:07:06	0|sipa|you're right
35 2017-11-25 21:07:41	0|sipa|git remote update seems to do the same
36 2017-11-25 21:08:57	0|wxss|i can die happy now! yeah fetch --all and remote update seem to do the same afaict
37 2017-11-25 21:10:02	0|sipa|apparently the difference is that remote update skips remotes that have a skipDefaultUpdate option set
38 2017-11-25 21:16:35	0|wxss|right, remote update is configurable with groups and skipDefault, where fetch --all isn't
39 2017-11-25 23:08:36	0|bitcoin-git|[13bitcoin] 15fanquake closed pull request #11761: [WIP] [docs] initial QT documentation (06master...06qt-docs) 02https://github.com/bitcoin/bitcoin/pull/11761
40 2017-11-25 23:09:22	0|fanquake|Apologies to anyone who's PRs I have closed inadvertently, keep hitting the close button after writing comments…
41 2017-11-25 23:10:02	0|Randolf|fanquake++