diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-13 23:34:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-13 23:34:58 -0800 |
| commit | 6a9b87972f27edfe53da4ce016adf4c0cd42f5e6 (patch) | |
| tree | 8bf0c7f24c13ab2cd0e401ef1b609d30486606e9 /Documentation | |
| parent | 057f98eda179491c3f32c556f523e8786c2cbab5 (diff) | |
| parent | 365463851303f74eb5e5be7101811f215602fcd9 (diff) | |
| download | git-6a9b87972f27edfe53da4ce016adf4c0cd42f5e6.tar.gz git-6a9b87972f27edfe53da4ce016adf4c0cd42f5e6.tar.xz | |
Merge some proposed fixes
Conflicts:
Documentation/git-commit.txt - taking the post 1.2.0 semantics.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-ls-files.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index e433407a4..fe5341295 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -80,7 +80,7 @@ OPTIONS R:: removed/deleted C:: modified/changed K:: to be killed - ? other + ?:: other --full-name:: When run from a subdirectory, the command usually |