| commit | d34f4d290f75c189e795df7c3732a5beb8e804ab | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 06:58:02 +0000 (21 22:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 06:58:02 +0000 (21 22:58 -0800) | ||
| tree | 2be0b333a178d47a7ca77f88ea8e46eed9b2406d | treesnapshot (tar.gz zip) |
| parent | 453a21c6965eeba020d171c9d64e43a31c91d127 | commitdiff |
| parent | dedc0ec5d778214528dae3bddf60d77cfcde4bd4 | commitdiff |
Merge branch 'master' into next
* master:
make "git patch-id" a built-in
make "git var" a built-in
fix git-p4 editor invocation
make "git hash-object" a built-in
make "git merge-tree" a built-in
slim down "git show-index"
Remove diff machinery dependency from read-cache
merge-recursive: do not return NULL only to cause segfault
git-rebase.txt: Fix spelling
retry request without query when info/refs?query fails
* master:
make "git patch-id" a built-in
make "git var" a built-in
fix git-p4 editor invocation
make "git hash-object" a built-in
make "git merge-tree" a built-in
slim down "git show-index"
Remove diff machinery dependency from read-cache
merge-recursive: do not return NULL only to cause segfault
git-rebase.txt: Fix spelling
retry request without query when info/refs?query fails