aboutsummaryrefslogtreecommitdiff
path: root/epoch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-05 20:54:42 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-05 20:54:42 -0800
commit5df466c507ee2dd81c2e9002c3fedf3536cde0dc (patch)
tree92fff315690007bbbdaa9116570a8a49b01f5420 /epoch.c
parent58e3fb40f7ca1c28f9105c15166884f80bb22e55 (diff)
parent92e802c6ccb96d1b5e8561b0a136d43d82253293 (diff)
downloadgit-5df466c507ee2dd81c2e9002c3fedf3536cde0dc.tar.gz
git-5df466c507ee2dd81c2e9002c3fedf3536cde0dc.tar.xz
Merge fixes up to GIT 1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'epoch.c')
-rw-r--r--epoch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epoch.c b/epoch.c
index db44f5ca9..3a767486d 100644
--- a/epoch.c
+++ b/epoch.c
@@ -190,7 +190,7 @@ static void free_mass_counter(struct mass_counter *counter)
* enqueued, enqueuing the commit in a list of pending commits, in latest
* commit date first order.
*
- * The algorithm then preceeds to visit each commit in the pending queue.
+ * The algorithm then proceeds to visit each commit in the pending queue.
* Upon each visit, the pending mass is added to the mass already seen for that
* commit and then divided into N equal portions, where N is the number of
* parents of the commit being visited. The divided portions are then injected