git, branch v1.4.2-rc1

Merge branch 'sp/reflog'

2006-07-17T08:08:11Z

* sp/reflog: Record rebase changes as 'rebase' in the reflog. Log ref changes made by resolve. Log ref changes made by quiltimport. Log ref changes made by git-merge and git-pull.

git-svn: don't check for migrations/upgrades on commit-diff

2006-07-16T20:46:47Z

Unlike other git-svn commands, commit-diff is intended to operate without needing any additional metadata inside .git Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

show-branch: fix performance problem.

2006-07-16T07:00:09Z

The core function used in show-branch, join_revs(), was supposed to be exactly the same algorithm as merge_bases(), except that it was a version enhanced for use with more than two heads. However, it needed to mark and keep a list of all the commits it has seen, because it needed them for its semi-graphical output. The function to implement this list, mark_seen(), stupidly used insert_by_date(), when it did not need to keep the list sorted during its processing. This made "show-branch --merge-base" more than 20x slower compared to "merge-base --all" in some cases (e.g. between b5032a5 and 48ce8b0 in the Linux 2.6 kernel archive). The performance of "show-branch --independent" suffered from the same reason. This patch sorts the resulting list after the list traversal just once to fix these problems. Signed-off-by: Junio C Hamano

Documentation/urls.txt: Use substitution to escape square brackets

2006-07-14T23:36:00Z

This changes "[user@]" to use {startsb} and {endsb} to insert [ and ], similar to how {caret} is used in git-rev-parse.txt. [jc: Removed a well-intentioned comment that broke the final formatting from the original patch. While we are at it, updated the paragraph that claims to be equivalent to the section that was updated earlier without making matching changes.] Signed-off-by: Jonas Fonseca Signed-off-by: Junio C Hamano

Documentation/Makefile: product depends on asciidoc.conf

2006-07-14T23:32:38Z

Signed-off-by: Junio C Hamano

Merge branch 'lt/unitype'

2006-07-14T22:39:19Z

* lt/unitype: builtin-prune.c: forgot TYPE => OBJ changes. Remove TYPE_* constant macros and use object_type enums consistently.

Merge branch 'sp/lazy-mkdir'

2006-07-14T22:38:37Z

* sp/lazy-mkdir: Make lazy mkdir more robust.

Fix "git-fetch --tags" exit status when nothing has been changed

2006-07-14T18:33:14Z

After commit 55b7835e1b81a6debc7648149d2b8a4c5c64ddba git-fetch --tags exits with status 1 when no tags have been changed, which breaks calling git-fetch from scripts. Signed-off-by: Sergey Vlasov Signed-off-by: Junio C Hamano

argv created by handle_alias should be NULL terminated

2006-07-14T18:32:39Z

Signed-off-by: Matthias Lederhofer Signed-off-by: Junio C Hamano

documentation (urls.txt) typofix

2006-07-14T18:31:50Z