author | Junio C Hamano <junkio@cox.net> | |
Sat, 6 May 2006 21:42:08 +0000 (14:42 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 6 May 2006 21:42:59 +0000 (14:42 -0700) | ||
commit | c66b6c067e49c5ec80f1254daef79aa1c7f5ffce | |
tree | 48367903de59ddef7aea7c8f20da4e07243e8d44 | tree | snapshot |
parent | 8ac80a5701780547404523a84f4b1ae67bfa6823 | commit | diff |
parent | bd886fd3ea49b726493255d4adf5d20b31681713 | commit | diff |
Merge branch 'master' into js/fmt-patch
* master: (109 commits)
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.
update-index: plug memory leak from prefix_path()
checkout-index: plug memory leak from prefix_path()
update-index --unresolve: work from a subdirectory.
pack-object: squelch eye-candy on non-tty
core.prefersymlinkrefs: use symlinks for .git/HEAD
repo-config: trim white-space before comment
Fix for config file section parsing.
Clarify git-cherry documentation.
Update git-unpack-objects documentation.
Fix up docs where "--" isn't displayed correctly.
Several trivial documentation touch ups.
git-svn 1.0.0
git-svn: documentation updates
delta: stricter constness
Makefile: do not link rev-list any specially.
builtin-push: --all and --tags _are_ explicit refspecs
builtin-log/whatchanged/show: make them official.
show-branch: omit uninteresting merges.
...
* master: (109 commits)
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.
update-index: plug memory leak from prefix_path()
checkout-index: plug memory leak from prefix_path()
update-index --unresolve: work from a subdirectory.
pack-object: squelch eye-candy on non-tty
core.prefersymlinkrefs: use symlinks for .git/HEAD
repo-config: trim white-space before comment
Fix for config file section parsing.
Clarify git-cherry documentation.
Update git-unpack-objects documentation.
Fix up docs where "--" isn't displayed correctly.
Several trivial documentation touch ups.
git-svn 1.0.0
git-svn: documentation updates
delta: stricter constness
Makefile: do not link rev-list any specially.
builtin-push: --all and --tags _are_ explicit refspecs
builtin-log/whatchanged/show: make them official.
show-branch: omit uninteresting merges.
...
builtin.h | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
git.c | diff1 | | diff2 | | blob | history |
log-tree.c | diff1 | | diff2 | | blob | history |
show-branch.c | diff1 | | diff2 | | blob | history |