git - Cleaning up a remote tree after a rebase -

-



after pushing rebase bare remote , running git gc --aggressive --prune=now on remote, else needed force commit history of remote indicate same history new checkout remote would, no indication of rebase? example, needs done on remote remove history , show single squashed commit:

$ mkdir test  $ cd test  $ git init  $ touch foo  $ git add foo  $ git commit -m 'initial commit.'  $ git remote add origin ssh://user@git.domain.com:29418/~user/test.git  $ git push -u origin master  $ in {1..10} > >   echo $i >>foo >   git add -u >   git commit -m "adding $i foo." >   git push origin master > done  $ git reset --soft 99a31c5906f82b333ca5c6204a3f83e3f100d4e7  $ cat foo 1 2 3 4 5 6 7 8 9 10  $ git commit --amend --no-edit  $ git push origin master --force  # on git server inside bare repo:  [root@server test.git]# git log --graph --all --oneline * 8068d90 push * 203f010 push * 58b851d push * 5e385c9 push * 3c3a5b2 push * 5b40efd push * 558d8e1 push * 61e170a push * d1b60df push * 36f44a8 push * 3056f9c push * e9e8fc6 push * e40692c created branch refs/meta/gitblit/reflog * 327e77a initial commit.





wiki

Comments

Post a Comment

Popular posts from this blog

python - Read npy file directly from S3 StreamingBody -

-
i have many .npy (numpy) , .json files saved in s3, need download , load these files. for json files downloading files , loading dictionary using following code: obj = s3.object(bucket, key) response = obj.get() body = response['body'].read().decode('utf-8') data = json.loads(body) that way avoid writing .json file disk , reading it. now want same .npy files, equivalent? currently downloading file, saving temp file on disk , loading np.load avoid if possible. following https://stackoverflow.com/a/28196540/3509999 : obj = s3.object(bucket, key) io.bytesio(obj.get()["body"].read()) f: # rewind file f.seek(0) arr = np.load(f) wiki
Read more

python - Minimize function with Scipy minimize -

-
trying obtain d value (integer) std_diff objective function minimal, using scipy minimize. my code: def std_diff(d): return std(diff(df['bn'].values,d)); scipy.optimize import minimize b=(3,) res = minimize(std_diff,(1,), method='slsqp', bounds = b) **df['bn'].values** out[72]: array([ 2, 2, 2, 2, 3, 2, 7, 5, 7, 11, 8, 2, 11, 7, 15, 8, 7, 12, 21, 19, 32, 35, 40, 35, 21, 19, 25, 20, 40, 80, 99], dtype=int64) error is"indexerror: many indices array " in case not use bounds : res = minimize(std_diff,(1,), method='slsqp'), error: > in _minimize_slsqp(func, x0, args, jac, bounds, constraints, maxiter, > ftol, iprint, disp, eps, callback, **unknown_options) > 368 fx = float(np.asarray(func(x))) > 369 except: > --> 370 raise valueerror("objective function must return scalar") > 371 # compute constraints > 3
Read more

kotlin - Out-projected type in generic interface prohibits the use of metod with generic parameter -

-
i start using kotlin , defined interface this: interface aadapter<vh : recyclerview.viewholder> { fun oncreateaviewholder(parent: viewgroup): vh fun onbindaviewholder(v: vh, position: int) } and when try use on code: class klasa ( private val adapter: aadapter<*> ) { fun dosth(){ //... val vh = this.adapter.oncreateaviewholder(parent) //on below line error adapter.onbindaviewholder(v, position) //... } } i error out-projected type 'aadapter<*>' prohibits use of 'public abstract fun onbindaviewholder(v: t, position: int): unit i tied add "in" or "out" definition i'm confused. how allow it. replace aadapter<*> aadapter<recyclerview.viewholder> . class klasa ( private val adapter: aadapter<recyclerview.viewholder> ) { // ... because have declared aadapter has type parameter vh type subclass of recyclerview.
Read more