Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'js/maint-submodule-checkout' into maint | Junio C Hamano | 2009-04-18 |
|\ | |||
| * | Fix 'git checkout <submodule>' to update the index | Johannes Schindelin | 2009-04-02 |
* | | Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint | Junio C Hamano | 2009-04-18 |
|\ \ | |||
| * | | update cache for conflicting submodule entries | Clemens Buchacher | 2009-04-05 |
| * | | add tests for merging with submodules | Clemens Buchacher | 2009-04-05 |
* | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-04-18 |
|\ \ \ | |||
| * | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variable | Frank Lichtenheld | 2009-04-18 |
* | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-17 |
|\ \ \ \ | |||
| * \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-17 |
| |\ \ \ \ | | |/ / / | |||
| | * | | | Fix buffer overflow in config parser | Thomas Jarosch | 2009-04-17 |
| * | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1 | Junio C Hamano | 2009-04-08 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'jc/shared-literally' into maint | Junio C Hamano | 2009-04-08 |
|\ \ \ \ \ \ | |||
| * | | | | | | t1301: loosen test for forced modes | Jeff King | 2009-04-01 |
| * | | | | | | "core.sharedrepository = 0mode" should set, not loosen | Junio C Hamano | 2009-03-27 |
* | | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint | Junio C Hamano | 2009-04-08 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | diff --cached: do not borrow from a work tree when a path is marked as assume... | Junio C Hamano | 2009-03-22 |
* | | | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint | Junio C Hamano | 2009-04-08 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | pack-objects: don't loosen objects available in alternate or kept packs | Brandon Casey | 2009-03-21 |
| * | | | | | | | | t7700: demonstrate repack flaw which may loosen objects unnecessarily | Brandon Casey | 2009-03-21 |
| * | | | | | | | | pack-objects: only repack or loosen objects residing in "local" packs | Brandon Casey | 2009-03-20 |
| * | | | | | | | | git-repack.sh: don't use --kept-pack-only option to pack-objects | Brandon Casey | 2009-03-20 |
| * | | | | | | | | t7700-repack: add two new tests demonstrating repacking flaws | Brandon Casey | 2009-03-20 |
* | | | | | | | | | Change double quotes to single quotes in message | Jari Aalto | 2009-04-07 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||
* | | | | | | | | Merge branch 'js/maint-diff-temp-smudge' into maint | Junio C Hamano | 2009-04-02 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Smudge the files fed to external diff and textconv | Johannes Schindelin | 2009-03-22 |
* | | | | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint | Junio C Hamano | 2009-04-02 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | |||
| * | | | | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1" | Brandon Casey | 2009-03-21 |
* | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-03-28 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | |||
| * | | | | | | test-lib: Clean up comments and Makefile. | Emil Sit | 2009-03-28 |
| * | | | | | | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1 | Junio C Hamano | 2009-03-21 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 | Junio C Hamano | 2009-03-21 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-03-12 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | * | | | | | | | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0 | Junio C Hamano | 2009-03-12 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0 | Junio C Hamano | 2009-03-12 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0 | Junio C Hamano | 2009-03-12 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0 | Junio C Hamano | 2009-03-12 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1 | Junio C Hamano | 2009-03-12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1 | Junio C Hamano | 2009-03-12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 | Junio C Hamano | 2009-03-12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1 | Junio C Hamano | 2009-03-12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1 | Junio C Hamano | 2009-03-12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1 | Junio C Hamano | 2009-03-12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-1.6.0-send-email-irt' into maint | Junio C Hamano | 2009-03-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | send-email: test --no-thread --in-reply-to combination | Thomas Rast | 2009-03-11 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | Merge branch 'mg/maint-submodule-normalize-path' into maint | Junio C Hamano | 2009-03-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | git submodule: Fix adding of submodules at paths with ./, .. and // | Michael J Gruber | 2009-03-03 |
| * | | | | | | | | | | | | | | | | | | git submodule: Add test cases for git submodule add | Michael J Gruber | 2009-03-03 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/rsync-local' into maint | Junio C Hamano | 2009-03-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | rsync transport: allow local paths, and fix tests | Johannes Schindelin | 2009-03-10 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint | Junio C Hamano | 2009-03-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |