author | Junio C Hamano <junkio@cox.net> | |
Thu, 28 Sep 2006 05:23:12 +0000 (22:23 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 28 Sep 2006 05:23:12 +0000 (22:23 -0700) | ||
commit | 2958d9b5dbebeb82e7230bbfd3f421781d90f3f7 | |
tree | 881c16a7442a1829d8959aee272f50065c53b582 | tree | snapshot |
parent | 194db7e3bbab9669c511133549e6ae74481c9a4f | commit | diff |
parent | 51b2dd4e3f730f6be6c19faf3b4a04caea9e0420 | commit | diff |
Merge branch 'master' into lj/refs
* master: (72 commits)
runstatus: do not recurse into subdirectories if not needed
grep: fix --fixed-strings combined with expression.
grep: free expressions and patterns when done.
Corrected copy-and-paste thinko in ignore executable bit test case.
An illustration of rev-list --parents --pretty=raw
Allow git-checkout when on a non-existant branch.
gitweb: Decode long title for link tooltips
git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
Ignore executable bit when adding files if filemode=0.
Remove empty ref directories that prevent creating a ref.
Use const for interpolate arguments
git-archive: update documentation
Deprecate merge-recursive.py
gitweb: fix over-eager application of esc_html().
Allow '(no author)' in git-svn's authors file.
Allow 'svn fetch' on '(no date)' revisions in Subversion.
git-repack: allow git-repack to run in subdirectory
Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
git-tar-tree: Move code for git-archive --format=tar to archive-tar.c
git-tar-tree: Remove duplicate git_config() call
...
* master: (72 commits)
runstatus: do not recurse into subdirectories if not needed
grep: fix --fixed-strings combined with expression.
grep: free expressions and patterns when done.
Corrected copy-and-paste thinko in ignore executable bit test case.
An illustration of rev-list --parents --pretty=raw
Allow git-checkout when on a non-existant branch.
gitweb: Decode long title for link tooltips
git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
Ignore executable bit when adding files if filemode=0.
Remove empty ref directories that prevent creating a ref.
Use const for interpolate arguments
git-archive: update documentation
Deprecate merge-recursive.py
gitweb: fix over-eager application of esc_html().
Allow '(no author)' in git-svn's authors file.
Allow 'svn fetch' on '(no date)' revisions in Subversion.
git-repack: allow git-repack to run in subdirectory
Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
git-tar-tree: Move code for git-archive --format=tar to archive-tar.c
git-tar-tree: Remove duplicate git_config() call
...
12 files changed:
.gitignore | diff1 | | diff2 | | blob | history |
Makefile | diff1 | | diff2 | | blob | history |
builtin-init-db.c | diff1 | | diff2 | | blob | history |
builtin-update-index.c | diff1 | | diff2 | | blob | history |
builtin.h | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
git-branch.sh | diff1 | | diff2 | | blob | history |
git-checkout.sh | diff1 | | diff2 | | blob | history |
git.c | diff1 | | diff2 | | blob | history |
receive-pack.c | diff1 | | diff2 | | blob | history |
revision.c | diff1 | | diff2 | | blob | history |
sha1_name.c | diff1 | | diff2 | | blob | history |