diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:15 -0700 |
| commit | c9fc3a6ac5011ce03e8132973687d1242807dc6c (patch) | |
| tree | 9d8a40b578307a5be129f5385ad28fea3d8e8bad /Documentation | |
| parent | 1a81f6ceea7795e2b78cebd356d276afe79e7626 (diff) | |
| parent | e143ef4f6b08e0f948180f28ad3ba77c9a2e0a61 (diff) | |
| download | git-c9fc3a6ac5011ce03e8132973687d1242807dc6c.tar.gz git-c9fc3a6ac5011ce03e8132973687d1242807dc6c.tar.xz | |
Merge branch 'fc/remote-helper-refmap'
Allow remote-helper/fast-import based transport to rename the refs
while transferring the history.
* fc/remote-helper-refmap:
transport-helper: remove unnecessary strbuf resets
transport-helper: add support to delete branches
fast-export: add support to delete refs
fast-import: add support to delete refs
transport-helper: add support to push symbolic refs
transport-helper: add support for old:new refspec
fast-export: add new --refspec option
fast-export: improve argument parsing
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-export.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-fast-import.txt | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index 85f1f30fd..221506b04 100644 --- a/Documentation/git-fast-export.txt +++ b/Documentation/git-fast-export.txt @@ -105,6 +105,10 @@ marks the same across runs. in the commit (as opposed to just listing the files which are different from the commit's first parent). +--refspec:: + Apply the specified refspec to each ref exported. Multiple of them can + be specified. + [<git-rev-list-args>...]:: A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 3ffa2fa2c..377eeaa36 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -483,6 +483,9 @@ Marks must be declared (via `mark`) before they can be used. * Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details. +* The special null SHA-1 (40 zeros) specifies that the branch is to be + removed. + The special case of restarting an incremental import from the current branch value should be written as: ---- |