author | Junio C Hamano <gitster@pobox.com> | |
Tue, 31 Aug 2010 23:23:31 +0000 (16:23 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 31 Aug 2010 23:23:31 +0000 (16:23 -0700) | ||
commit | 633142d86874ee8ce79a23ee4346f32e6271faad | |
tree | 8096e26f84075d3aae42d13fe0b76c2a5f2ea07c | tree | snapshot |
parent | 693fefe3d022767975eec7585561bfe178b873f4 | commit | diff |
parent | 41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd | commit | diff |
Merge branch 'jn/paginate-fix'
* jn/paginate-fix:
t7006 (pager): add missing TTY prerequisites
merge-file: run setup_git_directory_gently() sooner
var: run setup_git_directory_gently() sooner
ls-remote: run setup_git_directory_gently() sooner
index-pack: run setup_git_directory_gently() sooner
config: run setup_git_directory_gently() sooner
bundle: run setup_git_directory_gently() sooner
apply: run setup_git_directory_gently() sooner
grep: run setup_git_directory_gently() sooner
shortlog: run setup_git_directory_gently() sooner
git wrapper: allow setup_git_directory_gently() be called earlier
setup: remember whether repository was found
git wrapper: introduce startup_info struct
Conflicts:
builtin/index-pack.c
* jn/paginate-fix:
t7006 (pager): add missing TTY prerequisites
merge-file: run setup_git_directory_gently() sooner
var: run setup_git_directory_gently() sooner
ls-remote: run setup_git_directory_gently() sooner
index-pack: run setup_git_directory_gently() sooner
config: run setup_git_directory_gently() sooner
bundle: run setup_git_directory_gently() sooner
apply: run setup_git_directory_gently() sooner
grep: run setup_git_directory_gently() sooner
shortlog: run setup_git_directory_gently() sooner
git wrapper: allow setup_git_directory_gently() be called earlier
setup: remember whether repository was found
git wrapper: introduce startup_info struct
Conflicts:
builtin/index-pack.c
builtin/apply.c | diff1 | | diff2 | | blob | history |
builtin/config.c | diff1 | | diff2 | | blob | history |
builtin/grep.c | diff1 | | diff2 | | blob | history |
builtin/index-pack.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
git.c | diff1 | | diff2 | | blob | history |
setup.c | diff1 | | diff2 | | blob | history |