diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:13 -0700 |
| commit | 12d4ffaa94c1379c307cdf489565531c5d6c94fd (patch) | |
| tree | 2e6897478bb7449bcd0bcb58022ae71af112c3f1 /Documentation | |
| parent | 451316d9bd9d117533cf32bb352bc370190075fc (diff) | |
| parent | 62d955fd435273dcd9fffed0c0d83bbe90006a0a (diff) | |
| download | git-12d4ffaa94c1379c307cdf489565531c5d6c94fd.tar.gz | |
Merge branch 'sb/pull-rebase'
* sb/pull-rebase:
parse-remote: remove unused functions
parse-remote: support default reflist in get_remote_merge_branch
parse-remote: function to get the tracking branch to be merge
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-parse-remote.txt | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt index cd43069874..39d9daa7e0 100644 --- a/Documentation/git-parse-remote.txt +++ b/Documentation/git-parse-remote.txt @@ -17,26 +17,6 @@ routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing. -The primary entry points are: - -get_remote_refs_for_fetch:: - Given the list of user-supplied `<repo> <refspec>...`, - return the list of refs to fetch after canonicalizing - them into `$GIT_DIR` relative paths - (e.g. `refs/heads/foo`). When `<refspec>...` is empty - the returned list of refs consists of the defaults - for the given `<repo>`, if specified in - `$GIT_DIR/remotes/`, `$GIT_DIR/branches/`, or `remote.*.fetch` - configuration. - -get_remote_refs_for_push:: - Given the list of user-supplied `<repo> <refspec>...`, - return the list of refs to push in a form suitable to be - fed to the 'git-send-pack' command. When `<refspec>...` - is empty the returned list of refs consists of the - defaults for the given `<repo>`, if specified in - `$GIT_DIR/remotes/`. - Author ------ Written by Junio C Hamano. |