diff options
author | Junio C Hamano <junkio@cox.net> | 2006-08-15 03:13:34 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-15 03:13:34 -0700 |
commit | d7b6c3c0f54b951c85cd41c6e6571c65cf090111 (patch) | |
tree | 44c009ddd29ab5a986dba9028d0b57a0b2e03201 /merge-tree.c | |
parent | pass DESTDIR to the generated perl/Makefile (diff) | |
parent | git-apply --binary: clean up and prepare for --reverse (diff) | |
download | tgif-d7b6c3c0f54b951c85cd41c6e6571c65cf090111.tar.xz |
Merge branch 'master' into pb/gitpm
* master: (166 commits)
git-apply --binary: clean up and prepare for --reverse
Fix detection of ipv6 on Solaris
Look for sockaddr_storage in sys/socket.h
Solaris has strlcpy() at least since version 8
git-apply --reverse: simplify reverse option.
t4116 apply --reverse test
Make sha1flush void and remove conditional return.
Make upload_pack void and remove conditional return.
Make track_tree_refs void.
Make pack_objects void.
Make fsck_dir void.
Make checkout_all void.
Make show_entry void
Make pprint_tag void and cleans up call in cmd_cat_file.
Remove combine-diff.c::uninteresting()
read-cache.c cleanup
http-push.c cleanup
diff.c cleanup
builtin-push.c cleanup
builtin-grep.c cleanup
...
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions