diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:23:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:23:19 -0700 |
commit | 693fefe3d022767975eec7585561bfe178b873f4 (patch) | |
tree | 052a0be20d04a5b79f1bc1f166003a33470e5991 /git.c | |
parent | 1253164c8badf75034b8ba7c1cfabb1993fa7cf7 (diff) | |
parent | 98937bef1bf1c8eea90c209c601d4338a43a3479 (diff) | |
download | git-693fefe3d022767975eec7585561bfe178b873f4.tar.gz |
Merge branch 'jn/maint-setup-fix'
* jn/maint-setup-fix:
setup: split off a function to handle ordinary .git directories
Revert "rehabilitate 'git index-pack' inside the object store"
setup: do not forget working dir from subdir of gitdir
t4111 (apply): refresh index before applying patches to it
setup: split off get_device_or_die helper
setup: split off a function to handle hitting ceiling in repo search
setup: split off code to handle stumbling upon a repository
setup: split off a function to checks working dir for .git file
setup: split off $GIT_DIR-set case from setup_git_directory_gently
tests: try git apply from subdir of toplevel
t1501 (rev-parse): clarify
Conflicts:
builtin/index-pack.c
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions