author | Junio C Hamano <gitster@pobox.com> | |
Wed, 19 Sep 2007 00:42:15 +0000 (17:42 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 19 Sep 2007 00:42:15 +0000 (17:42 -0700) | ||
commit | 39bd2eb56af89d43a08ba54699d9a1849ab57b39 | |
tree | 7551a984921081bf2532f68303febe7275107ed1 | tree | snapshot |
parent | 68d3025a805097ec148ec6e9b0b54a5db1ef138e | commit | diff |
parent | 89df580d0a2e97b0c7c072d87e5e815534deed56 | commit | diff |
Merge branch 'master' into ph/strbuf
* master: (94 commits)
Fixed update-hook example allow-users format.
Documentation/git-svn: updated design philosophy notes
t/t4014: test "am -3" with mode-only change.
git-commit.sh: Shell script cleanup
preserve executable bits in zip archives
Fix lapsus in builtin-apply.c
git-push: documentation and tests for pushing only branches
git-svnimport: Use separate arguments in the pipe for git-rev-parse
contrib/fast-import: add perl version of simple example
contrib/fast-import: add simple shell example
rev-list --bisect: Bisection "distance" clean up.
rev-list --bisect: Move some bisection code into best_bisection.
rev-list --bisect: Move finding bisection into do_find_bisection.
Document ls-files --with-tree=<tree-ish>
git-commit: partial commit of paths only removed from the index
git-commit: Allow partial commit of file removal.
send-email: make message-id generation a bit more robust
git-apply: fix whitespace stripping
git-gui: Disable native platform text selection in "lists"
apply --index-info: fall back to current index for mode changes
...
* master: (94 commits)
Fixed update-hook example allow-users format.
Documentation/git-svn: updated design philosophy notes
t/t4014: test "am -3" with mode-only change.
git-commit.sh: Shell script cleanup
preserve executable bits in zip archives
Fix lapsus in builtin-apply.c
git-push: documentation and tests for pushing only branches
git-svnimport: Use separate arguments in the pipe for git-rev-parse
contrib/fast-import: add perl version of simple example
contrib/fast-import: add simple shell example
rev-list --bisect: Bisection "distance" clean up.
rev-list --bisect: Move some bisection code into best_bisection.
rev-list --bisect: Move finding bisection into do_find_bisection.
Document ls-files --with-tree=<tree-ish>
git-commit: partial commit of paths only removed from the index
git-commit: Allow partial commit of file removal.
send-email: make message-id generation a bit more robust
git-apply: fix whitespace stripping
git-gui: Disable native platform text selection in "lists"
apply --index-info: fall back to current index for mode changes
...
builtin-apply.c | diff1 | | diff2 | | blob | history |
builtin-log.c | diff1 | | diff2 | | blob | history |
builtin-rev-list.c | diff1 | | diff2 | | blob | history |
builtin-update-index.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
diff.c | diff1 | | diff2 | | blob | history |