| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 31 Jul 2006 06:42:10 +0000 (23:42 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 31 Jul 2006 06:42:10 +0000 (23:42 -0700) | ||
| commit | c1a788aceecb0a8e95d6442938ade9ca43df033e | |
| tree | 30d99ae60a57281f75586d64f9853429fa3d26e7 | tree | snapshot |
| parent | f59aac47f3839367d0da04019b0fc2bd61345225 | commit | diff |
| parent | 076b0adcf9dac7bd9d18624087f679cc811aeb77 | commit | diff |
Merge branch 'js/read-tree' into js/c-merge-recursive
* js/read-tree: (107 commits)
read-tree: move merge functions to the library
read-trees: refactor the unpack_trees() part
tar-tree: illustrate an obscure feature better
git.c: allow alias expansion without a git directory
setup_git_directory_gently: do not barf when GIT_DIR is given.
Build on Debian GNU/kFreeBSD
Call setup_git_directory() much earlier
Call setup_git_directory() early
Display an error from update-ref if target ref name is invalid.
Fix http-fetch
t4103: fix binary patch application test.
git-apply -R: binary patches are irreversible for now.
Teach git-apply about '-R'
Makefile: ssh-pull.o depends on ssh-fetch.c
log and diff family: honor config even from subdirectories
git-reset: detect update-ref error and report it.
lost-found: use fsck-objects --full
Teach git-http-fetch the --stdin switch
Teach git-local-fetch the --stdin switch
Make pull() support fetching multiple targets at once
...
* js/read-tree: (107 commits)
read-tree: move merge functions to the library
read-trees: refactor the unpack_trees() part
tar-tree: illustrate an obscure feature better
git.c: allow alias expansion without a git directory
setup_git_directory_gently: do not barf when GIT_DIR is given.
Build on Debian GNU/kFreeBSD
Call setup_git_directory() much earlier
Call setup_git_directory() early
Display an error from update-ref if target ref name is invalid.
Fix http-fetch
t4103: fix binary patch application test.
git-apply -R: binary patches are irreversible for now.
Teach git-apply about '-R'
Makefile: ssh-pull.o depends on ssh-fetch.c
log and diff family: honor config even from subdirectories
git-reset: detect update-ref error and report it.
lost-found: use fsck-objects --full
Teach git-http-fetch the --stdin switch
Teach git-local-fetch the --stdin switch
Make pull() support fetching multiple targets at once
...
| Makefile | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| git-merge.sh | diff1 | | diff2 | | blob | history |
| git-rebase.sh | diff1 | | diff2 | | blob | history |
| read-cache.c | diff1 | | diff2 | | blob | history |