git, branch v1.7.11.6 Fork of git SCM with my patches. http://git.kilabit.info/git/atom?h=v1.7.11.6 2012-09-11T18:18:48Z Git 1.7.11.6 2012-09-11T18:18:48Z Junio C Hamano gitster@pobox.com 2012-09-11T18:18:48Z urn:sha1:e09e4024a070e666ed40b66442e8151b91d623e4 Signed-off-by: Junio C Hamano <gitster@pobox.com> Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11 2012-09-11T18:10:23Z Junio C Hamano gitster@pobox.com 2012-09-11T18:10:23Z urn:sha1:23242a6f9e838013fbfddd4e8eb023d8c9328d37 * jc/maint-mergetool-style-fix: mergetool: style fixes Merge branch 'sz/submodule-force-update' into maint-1.7.11 2012-09-11T18:10:17Z Junio C Hamano gitster@pobox.com 2012-09-11T18:10:17Z urn:sha1:ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44 * sz/submodule-force-update: Make 'git submodule update --force' always check out submodules. Merge branch 'ph/stash-rerere' into maint-1.7.11 2012-09-11T18:10:12Z Junio C Hamano gitster@pobox.com 2012-09-11T18:10:12Z urn:sha1:ef92392b6c8596b61eab6f2045a54c086f340cf7 * ph/stash-rerere: stash: invoke rerere in case of conflict test: git-stash conflict sets up rerere Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11 2012-09-11T18:09:19Z Junio C Hamano gitster@pobox.com 2012-09-11T18:09:19Z urn:sha1:91feb387f2cba906a233c3683cfa5ff2bc32d79a * jc/maint-sane-execvp-notdir: sane_execvp(): ignore non-directory on $PATH Merge branch 'jc/maint-config-exit-status' into maint-1.7.11 2012-09-11T18:09:09Z Junio C Hamano gitster@pobox.com 2012-09-11T18:09:09Z urn:sha1:4c3fda0920ef49b323416685ec843d6a12a27b3f * jc/maint-config-exit-status: config: "git config baa" should exit with status 1 Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11 2012-09-11T18:09:01Z Junio C Hamano gitster@pobox.com 2012-09-11T18:09:01Z urn:sha1:f6854cad2a7a7da0a360bd520d2a86af89a36c6c * mh/maint-config-doc-proxy-command: git-config doc: unconfuse an example git-config.txt: fix example Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11 2012-09-11T18:08:55Z Junio C Hamano gitster@pobox.com 2012-09-11T18:08:55Z urn:sha1:fe31b2afac2fbae25086ecd00a1f57bcd74e9148 * hv/submodule-path-unmatch: Let submodule command exit with error status if path does not exist Merge branch 'mz/empty-rebase-test' into maint-1.7.11 2012-09-11T18:08:48Z Junio C Hamano gitster@pobox.com 2012-09-11T18:08:48Z urn:sha1:ef66ac3ead836c272b20550b09dad7def6084560 * mz/empty-rebase-test: add tests for 'git rebase --keep-empty' Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11 2012-09-11T18:08:40Z Junio C Hamano gitster@pobox.com 2012-09-11T18:08:40Z urn:sha1:515cd1913c17c0fca2e52434d118257ea105c3ec * jk/docs-docbook-monospace-display: docs: monospace listings in docbook output