Re: [PATCH v2] Give git-pull a --reset option

2019-04-20 Thread Junio C Hamano
Alex Henrie writes: > A common workflow is to make a commit on a local branch, push the branch > to the remote, check out the remote branch on a second computer, amend > the commit on the second computer, force-push back to the remote branch, > and finally submit a pull request. However, if the u

Re: doc bug: update-ref --create-reflog also works with --stdin

2019-04-20 Thread Junio C Hamano
Chris Jerdonek writes: > The update-ref documentation says that --create-reflog can only be > passed when providing a new ref to create and doesn't say it can also > be used with --stdin: True. It instead should say that it only makes sense when creating a new ref; it does not matter where the

Re: I messed up my own git tree and I don't know how to fix it.

2019-04-20 Thread Adrian H
If I understand the commands you are using correctly, you are referencing the remote repo. You need to reference the local repo. So try using the following commands: git checkout -- alecthomas/gometalinter git checkout -- kisielk/errcheck git checkout -- rogpeppe/godef Or if those are the only f

Re: [PATCH] reset.txt: update the title line to cover all use cases

2019-04-20 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > git-reset could be used in three different ways: > > - move HEAD to somewhere, optionally (not) update worktree/index > - "move" HEAD to HEAD, mainly to update worktree/index > - just update the index from some tree-ish > > The second case is frankly a (neat) corne

[PATCH v2] Give git-pull a --reset option

2019-04-20 Thread Alex Henrie
A common workflow is to make a commit on a local branch, push the branch to the remote, check out the remote branch on a second computer, amend the commit on the second computer, force-push back to the remote branch, and finally submit a pull request. However, if the user switches back to the first

I messed up my own git tree and I don't know how to fix it.

2019-04-20 Thread rob
I have my own code at a github repository, using Go.  Part of using Go libraries not part of the official Go people is by using a system they call go get.  This essentially uses git to, well, go get source code.  Mine are at github.com and golang.org.  My computer runs LinuxMint 19.1. I used g

Re: [PATCH] t5304: add a test for pruning with bitmaps

2019-04-20 Thread Derrick Stolee
On 4/19/2019 11:24 PM, Jeff King wrote: > Try running t5304 with this: > > diff --git a/reachable.c b/reachable.c > index eba6f64e01..7ec73ef43f 100644 > --- a/reachable.c > +++ b/reachable.c > @@ -191,6 +191,8 @@ static int mark_object_seen(const struct object_id *oid, > if (!obj) >

Re: Git subtree error on windows 10 with 2.21 version

2019-04-20 Thread Philip Oakley
Hi Nicola, On 10/04/2019 11:45, Nicola Farina wrote: Hi After upgrading to 2.21 issuing this subtree command: git subtree push --prefix ouverture Shared-Ouverture master I get these errors: C:/Program Files/Git/mingw64/libexec/git-core\git-subtree: line 636: /mingw64/libexec/git-core/git: N

Re: Resolving deltas dominates clone time

2019-04-20 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 20 2019, Jeff King wrote: > On Fri, Apr 19, 2019 at 03:47:22PM -0600, Martin Fick wrote: > >> I have been thinking about this problem, and I suspect that this compute time >> is actually spent doing SHA1 calculations, is that possible? Some basic back >> of the envelope math and scri