diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-03 22:56:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-03 22:56:59 -0700 |
| commit | e2b1accc59ab5d682d71fd801ebe959c3e871488 (patch) | |
| tree | fe7ff753798566ed54d2ac8af556ccc58cb4f471 /Documentation | |
| parent | f6b78c6eb626d477b252d39ef2801d4670675a2b (diff) | |
| parent | ed5f07a6fdc5653e24a5bd6c216d12bc878496bd (diff) | |
| download | git-e2b1accc59ab5d682d71fd801ebe959c3e871488.tar.gz git-e2b1accc59ab5d682d71fd801ebe959c3e871488.tar.xz | |
Merge branch 'maint'
* maint:
Document -<n> for git-format-patch
glossary: add 'reflog'
diff --no-index: fix --name-status with added files
Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-format-patch.txt | 3 | ||||
| -rw-r--r-- | Documentation/glossary.txt | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index e5638102e..6cbcf937b 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -53,6 +53,9 @@ OPTIONS ------- include::diff-options.txt[] +-<n>:: + Limits the number of patches to prepare. + -o|--output-directory <dir>:: Use <dir> to store the resulting files, instead of the current working directory. diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index e903abfeb..3f7b1e42b 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -330,6 +330,12 @@ This commit is referred to as a "merge commit", or sometimes just a denotes a particular <<def_object,object>>. These may be stored in `$GIT_DIR/refs/`. +[[def_reflog]]reflog:: + A reflog shows the local "history" of a ref. In other words, + it can tell you what the 3rd last revision in _this_ repository + was, and what was the current state in _this_ repository, + yesterday 9:14pm. See gitlink:git-reflog[1] for details. + [[def_refspec]]refspec:: A "refspec" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote |