diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-12 13:16:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-12 13:16:21 -0700 |
| commit | 667152528df417627e54de6cb281a63a727369af (patch) | |
| tree | 49322285618a48510e76a911f0b053285106d416 /arm/sha1_arm.S | |
| parent | t9400: Use the repository config and nothing else. (diff) | |
| parent | checkout: allow detaching to HEAD even when switching to the tip of a branch (diff) | |
| download | tgif-667152528df417627e54de6cb281a63a727369af.tar.xz | |
Merge branch 'maint'
* maint:
checkout: allow detaching to HEAD even when switching to the tip of a branch
Updated documentation of hooks in git-receive-pack.
Allow fetching references from any namespace
tiny fix in documentation of git-clone
Fix an unmatched comment end in arm/sha1_arm.S
Diffstat (limited to 'arm/sha1_arm.S')
| -rw-r--r-- | arm/sha1_arm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arm/sha1_arm.S b/arm/sha1_arm.S index da92d20e84..a328b73375 100644 --- a/arm/sha1_arm.S +++ b/arm/sha1_arm.S @@ -23,7 +23,7 @@ sha_transform: stmfd sp!, {r4 - r8, lr} @ for (i = 0; i < 16; i++) - @ W[i] = ntohl(((uint32_t *)data)[i]); */ + @ W[i] = ntohl(((uint32_t *)data)[i]); #ifdef __ARMEB__ mov r4, r0 |