Thread (1 message) 1 message, 1 author, 2019-11-04

Re: git branch --edit-description a custom file

From: Junio C Hamano <hidden>
Date: 2019-11-04 03:21:58

Jeff King [off-list ref] writes:
Do either of you use remote.pushDefault, branch.*.pushRemote, or
@{push}?

My triangular config for git.git looks like:

  [remote "origin"]
	url = https://github.com/gitster/git.git
  [remote "github"]
	url = https://github.com/peff/git.git
  [remote]
	pushDefault = github
  [branch "jk/foo"]
	remote = origin
	merge = refs/heads/master

Then upstream comparisons, "git rebase" etc without arguments, do what I
want: compare against master. And "git push" without arguments does what
I want: push this branch to my fork. And if I need to refer to the
pushed version for some reason (e.g., comparing what I just changed to
what I last sent out, "git range-diff @{u} @{push} HEAD" does the right
thing.
Yeah, I do recall we had quite a lot of design discussions around
"triangular" workflow when we introduced these facilities, and if I
am not mistaken, the above is the way they are designed to be used.

Thanks for an example.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help