summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-31 16:23:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-31 16:23:31 -0700
commit633142d86874ee8ce79a23ee4346f32e6271faad (patch)
tree8096e26f84075d3aae42d13fe0b76c2a5f2ea07c /userdiff.h
parentMerge branch 'jn/maint-setup-fix' (diff)
parentt7006 (pager): add missing TTY prerequisites (diff)
downloadtgif-633142d86874ee8ce79a23ee4346f32e6271faad.tar.xz
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
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions