aboutsummaryrefslogtreecommitdiff
path: root/Documentation/fetch-options.txt
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2005-11-06 23:30:56 -0600
committerJunio C Hamano <junkio@cox.net>2005-11-06 23:32:04 -0800
commit93d69d86912c44206543f6670e93f9fc6f2f859f (patch)
tree0ad7728ed8054bfbcaa42960a7e9a90532d89f18 /Documentation/fetch-options.txt
parent90279074ca5cc336a8bfffd47d19d089b291b432 (diff)
downloadgit-93d69d86912c44206543f6670e93f9fc6f2f859f.tar.gz
git-93d69d86912c44206543f6670e93f9fc6f2f859f.tar.xz
Refactored merge options into separate merge-options.txt.
Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/fetch-options.txt')
-rw-r--r--Documentation/fetch-options.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
new file mode 100644
index 000000000..12d12b27e
--- /dev/null
+++ b/Documentation/fetch-options.txt
@@ -0,0 +1,14 @@
+-a, \--append::
+ Append ref names and object names of fetched refs to the
+ existing contents of `.git/FETCH_HEAD`. Without this
+ option old data in `.git/FETCH_HEAD` will be overwritten.
+
+-f, \--force::
+
+-t, \--tags::
+
+-u, \--update-head-ok::
+ By default `git-fetch` refuses to update the head which
+ corresponds to the current branch. This flag disables the
+ check. Note that fetching into the current branch will not
+ update the index and working directory, so use it with care.