diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-03 17:18:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-03 17:18:21 -0700 |
| commit | e33b1dfe2834ceca1c449ec653dea636ca2d0200 (patch) | |
| tree | bfcef21ab182db7524419712a138d32deaf33fe8 /update-index.c | |
| parent | Merge branch 'js/repoconfig' into next (diff) | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-e33b1dfe2834ceca1c449ec653dea636ca2d0200.tar.xz | |
Merge branch 'master' into next
* master:
fix various typos in documentation
blame: Fix path pruning
cvsserver: use git-rev-list instead of git-log
Fix "git-log --parents" breakage post v1.3.0
add documentation for update-index --unresolve
Diffstat (limited to 'update-index.c')
| -rw-r--r-- | update-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/update-index.c b/update-index.c index 1c1f13bd70..061b18c1a5 100644 --- a/update-index.c +++ b/update-index.c @@ -485,7 +485,7 @@ static void read_index_info(int line_termination) } static const char update_index_usage[] = -"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>..."; +"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--ignore-missing] [-z] [--verbose] [--] <file>..."; static unsigned char head_sha1[20]; static unsigned char merge_head_sha1[20]; |