diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:17:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:17:36 -0700 |
| commit | c4a8354bc14e20d5ca6dc353e17e5b27fefefdab (patch) | |
| tree | 329e196f78a1563e7e8674af8b4f9324db973ce7 /Documentation/technical | |
| parent | Sixth batch for 2.5 cycle (diff) | |
| parent | for-each-ref: accept "%(push)" format (diff) | |
| download | tgif-c4a8354bc14e20d5ca6dc353e17e5b27fefefdab.tar.xz | |
Merge branch 'jk/at-push-sha1'
Introduce <branch>@{push} short-hand to denote the remote-tracking
branch that tracks the branch at the remote the <branch> would be
pushed to.
* jk/at-push-sha1:
for-each-ref: accept "%(push)" format
for-each-ref: use skip_prefix instead of starts_with
sha1_name: implement @{push} shorthand
sha1_name: refactor interpret_upstream_mark
sha1_name: refactor upstream_mark
remote.c: add branch_get_push
remote.c: return upstream name from stat_tracking_info
remote.c: untangle error logic in branch_get_upstream
remote.c: report specific errors from branch_get_upstream
remote.c: introduce branch_get_upstream helper
remote.c: hoist read_config into remote_get_1
remote.c: provide per-branch pushremote name
remote.c: hoist branch.*.remote lookup out of remote_get_1
remote.c: drop "remote" pointer from "struct branch"
remote.c: refactor setup of branch->merge list
remote.c: drop default_remote_name variable
Diffstat (limited to 'Documentation/technical')
| -rw-r--r-- | Documentation/technical/api-remote.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/technical/api-remote.txt b/Documentation/technical/api-remote.txt index 5d245aa9d1..2cfdd224a8 100644 --- a/Documentation/technical/api-remote.txt +++ b/Documentation/technical/api-remote.txt @@ -97,10 +97,6 @@ It contains: The name of the remote listed in the configuration. -`remote`:: - - The struct remote for that remote. - `merge_name`:: An array of the "merge" lines in the configuration. |