diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-15 19:58:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-15 19:59:48 -0700 |
| commit | fc196b68905958dac66e1baaa3b66b84a2cdacfc (patch) | |
| tree | efccd657eb978e810efee668522ce27ddd163f8b /git-merge-octopus.sh | |
| parent | config: run setup_git_directory_gently() sooner (diff) | |
| parent | Revert "rehabilitate 'git index-pack' inside the object store" (diff) | |
| download | tgif-fc196b68905958dac66e1baaa3b66b84a2cdacfc.tar.xz | |
Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix
* 'jn/maint-setup-fix' (early part):
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
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions