diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-22 00:35:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-22 00:35:07 -0800 |
| commit | 752b0fe287185886f9d89ebe126cd2e185d7e063 (patch) | |
| tree | 41514057ea4ca7f40e9c5a3c9df1fcafdfe6c23e /Documentation | |
| parent | 6b98579babe767b343bf6e1448b52befd5fc0a2e (diff) | |
| parent | aa064743fa69e2806d5e0af1fab103baa6fa57cd (diff) | |
| download | git-752b0fe287185886f9d89ebe126cd2e185d7e063.tar.gz git-752b0fe287185886f9d89ebe126cd2e185d7e063.tar.xz | |
Merge branch 'fix'
* fix:
git-push: Update documentation to describe the no-refspec behavior.
format-patch: pretty-print timestamp correctly.
git-add: Add support for --, documentation, and test.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-add.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-push.txt | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 89e461402..7e293834d 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -7,7 +7,7 @@ git-add - Add files to the index file. SYNOPSIS -------- -'git-add' [-n] [-v] <file>... +'git-add' [-n] [-v] [--] <file>... DESCRIPTION ----------- @@ -26,6 +26,11 @@ OPTIONS -v:: Be verbose. +--:: + This option can be used to separate command-line options from + the list of files, (useful when filenames might be mistaken + for command-line options). + DISCUSSION ---------- diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 5b891105b..6f4a48a10 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -43,6 +43,12 @@ to fast forward the remote ref that matches <dst>. If the optional plus `+` is used, the remote ref is updated even if it does not result in a fast forward update. + +Note: If no explicit refspec is found, (that is neither +on the command line nor in any Push line of the +corresponding remotes file---see below), then all the +refs that exist both on the local side and on the remote +side are updated. ++ Some short-cut notations are also supported. + * `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. |