diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-09-14 15:17:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-14 15:17:07 -0700 |
| commit | f6336167e9f233d3a68c8ded18b172ba50cde743 (patch) | |
| tree | 68dc04b198e56b0f03539a648dc2af84c41ee685 /builtin-add.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | Split grep arguments in a way that does not requires to add /dev/null. (diff) | |
| download | tgif-f6336167e9f233d3a68c8ded18b172ba50cde743.tar.xz | |
Merge branch 'jc/grep-c'
* jc/grep-c:
Split grep arguments in a way that does not requires to add /dev/null.
Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
Add test to check recent fix to "git add -u"
Documentation/git-archive.txt: a couple of clarifications.
Fix the rename detection limit checking
diff --no-index: do not forget to run diff_setup_done()
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-add.c b/builtin-add.c index 9847b7e019..3d8b8b4f89 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -95,7 +95,7 @@ static void update_callback(struct diff_queue_struct *q, const char *path = p->one->path; switch (p->status) { default: - die("unexpacted diff status %c", p->status); + die("unexpected diff status %c", p->status); case DIFF_STATUS_UNMERGED: case DIFF_STATUS_MODIFIED: case DIFF_STATUS_TYPE_CHANGED: |