Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1 | Junio C Hamano | 2013-04-07 |
|\ | |||
| * | t: check that a pattern without trailing slash matches a directory | Jeff King | 2013-03-28 |
* | | Merge branch 'kb/name-hash' into maint-1.8.1 | Junio C Hamano | 2013-04-03 |
|\ \ | |||
| * | | name-hash.c: fix endless loop with core.ignorecase=true | Karsten Blees | 2013-02-27 |
* | | | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1 | Junio C Hamano | 2013-04-03 |
|\ \ \ | |||
| * | | | Fix revision walk for commits with the same dates | Kacper Kornet | 2013-03-22 |
| |/ / | |||
* | | | Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1 | Junio C Hamano | 2013-04-03 |
|\ \ \ | |||
| * | | | t2003: work around path mangling issue on Windows | Johannes Sixt | 2013-03-20 |
| * | | | entry: fix filter lookup | John Keeping | 2013-03-14 |
| * | | | t2003: modernize style | John Keeping | 2013-03-14 |
* | | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1 | Junio C Hamano | 2013-04-03 |
|\ \ \ \ | |||
| * | | | | pack-refs: add fully-peeled trait | Michael Haggerty | 2013-03-18 |
| * | | | | pack-refs: write peeled entry for non-tags | Jeff King | 2013-03-17 |
* | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1 | Junio C Hamano | 2013-04-03 |
|\ \ \ \ \ | |||
| * | | | | | tests: make sure rename pretty print works | Antoine Pelisse | 2013-03-06 |
* | | | | | | t1507: Test that branchname@{upstream} is interpreted as branch | Kacper Kornet | 2013-03-17 |
* | | | | | | perf: update documentation of GIT_PERF_REPEAT_COUNT | Antoine Pelisse | 2013-03-09 |
* | | | | | | Merge branch 'mh/maint-ceil-absolute' into maint | Junio C Hamano | 2013-03-07 |
|\ \ \ \ \ \ | |||
| * | | | | | | Provide a mechanism to turn off symlink resolution in ceiling paths | Michael Haggerty | 2013-02-22 |
* | | | | | | | Make !pattern in .gitattributes non-fatal | Thomas Rast | 2013-03-01 |
* | | | | | | | Merge branch 'sp/smart-http-content-type-check' into maint | Junio C Hamano | 2013-02-25 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t5551: fix expected error output | Junio C Hamano | 2013-02-04 |
| * | | | | | | | Verify Content-Type from smart HTTP servers | Shawn Pearce | 2013-02-04 |
* | | | | | | | | Merge branch 'jc/combine-diff-many-parents' into maint | Junio C Hamano | 2013-02-25 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t4038: add tests for "diff --cc --raw <trees>" | John Keeping | 2013-02-05 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Documentation: "advice" is uncountable | Greg Price | 2013-02-25 |
* | | | | | | | | Merge branch 'mz/pick-unborn' into maint | Junio C Hamano | 2013-02-07 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | learn to pick/revert into unborn branch | Martin von Zweigbergk | 2012-12-23 |
| * | | | | | | | | tests: move test_cmp_rev to test-lib-functions | Martin von Zweigbergk | 2012-12-22 |
* | | | | | | | | | Merge branch 'nd/fix-perf-parameters-in-tests' into maint | Junio C Hamano | 2013-02-07 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | test-lib.sh: unfilter GIT_PERF_* | Nguyễn Thái Ngọc Duy | 2013-01-15 |
* | | | | | | | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into... | Junio C Hamano | 2013-02-07 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t9902: protect test from stray build artifacts | Junio C Hamano | 2013-01-24 |
* | | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint | Junio C Hamano | 2013-02-07 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-01-31 |
* | | | | | | | | | | | | Merge branch 'bc/git-p4-for-python-2.4' into maint | Junio C Hamano | 2013-02-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git-p4.py: support Python 2.4 | Brandon Casey | 2013-01-26 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jc/merge-blobs' into maint | Junio C Hamano | 2013-02-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | merge-tree: fix d/f conflicts | Junio C Hamano | 2012-12-26 |
| * | | | | | | | | | | | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 2012-12-26 |
* | | | | | | | | | | | | Merge branch 'tb/t0050-maint' into maint | Junio C Hamano | 2013-01-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | t0050: Use TAB for indentation | Torsten Bögershausen | 2013-01-21 |
| * | | | | | | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case) | Torsten Bögershausen | 2013-01-21 |
| * | | | | | | | | | | | | t0050: known breakage vanished in merge (case change) | Torsten Bögershausen | 2013-01-21 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'ap/status-ignored-in-ignored-directory' into maint | Junio C Hamano | 2013-01-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git-status: Test --ignored behavior | Antoine Pelisse | 2013-01-01 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'mh/ceiling' into maint | Junio C Hamano | 2013-01-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | string_list_longest_prefix(): remove function | Michael Haggerty | 2012-10-29 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | longest_ancestor_length(): require prefix list entries to be normalized | Michael Haggerty | 2012-10-29 |
* | | | | | | | | | | | Merge branch 'rs/zip-tests' into maint | Junio C Hamano | 2013-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | |