Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sp/smart-http-content-type-check' into maint | Junio C Hamano | 2013-02-25 | 4 | -0/+21 |
|\ | |||||
| * | t5551: fix expected error output | Junio C Hamano | 2013-02-04 | 1 | -2/+1 |
| * | Verify Content-Type from smart HTTP servers | Shawn Pearce | 2013-02-04 | 4 | -0/+22 |
* | | Merge branch 'jc/combine-diff-many-parents' into maint | Junio C Hamano | 2013-02-25 | 1 | -0/+24 |
|\ \ | |||||
| * | | t4038: add tests for "diff --cc --raw <trees>" | John Keeping | 2013-02-05 | 1 | -0/+24 |
* | | | Documentation: "advice" is uncountable | Greg Price | 2013-02-25 | 1 | -1/+1 |
* | | | Merge branch 'mz/pick-unborn' into maint | Junio C Hamano | 2013-02-07 | 9 | -40/+32 |
|\ \ \ | |||||
| * | | | learn to pick/revert into unborn branch | Martin von Zweigbergk | 2012-12-23 | 2 | -0/+17 |
| * | | | tests: move test_cmp_rev to test-lib-functions | Martin von Zweigbergk | 2012-12-22 | 7 | -40/+15 |
* | | | | Merge branch 'nd/fix-perf-parameters-in-tests' into maint | Junio C Hamano | 2013-02-07 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | test-lib.sh: unfilter GIT_PERF_* | Nguyễn Thái Ngọc Duy | 2013-01-15 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into... | Junio C Hamano | 2013-02-07 | 1 | -1/+24 |
|\ \ \ \ \ | |||||
| * | | | | | t9902: protect test from stray build artifacts | Junio C Hamano | 2013-01-24 | 1 | -1/+24 |
* | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint | Junio C Hamano | 2013-02-07 | 1 | -2/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-01-31 | 1 | -2/+28 |
* | | | | | | | Merge branch 'bc/git-p4-for-python-2.4' into maint | Junio C Hamano | 2013-02-04 | 1 | -5/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4.py: support Python 2.4 | Brandon Casey | 2013-01-26 | 1 | -5/+6 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/merge-blobs' into maint | Junio C Hamano | 2013-02-04 | 1 | -0/+44 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | merge-tree: fix d/f conflicts | Junio C Hamano | 2012-12-26 | 1 | -2/+2 |
| * | | | | | | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 2012-12-26 | 1 | -0/+44 |
* | | | | | | | Merge branch 'tb/t0050-maint' into maint | Junio C Hamano | 2013-01-30 | 1 | -35/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t0050: Use TAB for indentation | Torsten Bögershausen | 2013-01-21 | 1 | -33/+15 |
| * | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case) | Torsten Bögershausen | 2013-01-21 | 1 | -1/+1 |
| * | | | | | | | t0050: known breakage vanished in merge (case change) | Torsten Bögershausen | 2013-01-21 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ap/status-ignored-in-ignored-directory' into maint | Junio C Hamano | 2013-01-28 | 1 | -0/+146 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-status: Test --ignored behavior | Antoine Pelisse | 2013-01-01 | 1 | -0/+146 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mh/ceiling' into maint | Junio C Hamano | 2013-01-28 | 2 | -58/+13 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | string_list_longest_prefix(): remove function | Michael Haggerty | 2012-10-29 | 1 | -30/+0 |
| * | | | | | | longest_ancestor_length(): require prefix list entries to be normalized | Michael Haggerty | 2012-10-29 | 1 | -28/+13 |
* | | | | | | | Merge branch 'rs/zip-tests' into maint | Junio C Hamano | 2013-01-20 | 5 | -80/+140 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | t5003: check if unzip supports symlinks | René Scharfe | 2013-01-07 | 2 | -7/+19 |
| * | | | | | | t5000, t5003: move ZIP tests into their own script | René Scharfe | 2013-01-07 | 2 | -69/+119 |
| * | | | | | | t0024, t5000: use test_lazy_prereq for UNZIP | René Scharfe | 2013-01-07 | 2 | -14/+10 |
| * | | | | | | t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead | René Scharfe | 2013-01-06 | 3 | -8/+10 |
* | | | | | | | Merge branch 'jk/unify-exit-code-by-receiving-signal' into maint | Junio C Hamano | 2013-01-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | run-command: encode signal death as a positive integer | Jeff King | 2013-01-06 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maint | Junio C Hamano | 2013-01-14 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: support atomic operation with --separate-git-dir | Jens Lehmann | 2013-01-05 | 1 | -1/+11 |
* | | | | | | | | | Merge branch 'mk/maint-graph-infinity-loop' into maint | Junio C Hamano | 2013-01-14 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | graph.c: infinite loop in git whatchanged --graph -m | Michał Kiedrowicz | 2012-09-25 | 1 | -0/+10 |
* | | | | | | | | | | Merge branch 'jk/enable-test-lint-by-default' into maint | Junio C Hamano | 2013-01-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | tests: turn on test-lint by default | Jeff King | 2013-01-03 | 1 | -0/+1 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint | Junio C Hamano | 2013-01-11 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge: Honor prepare-commit-msg return code | Antoine Pelisse | 2013-01-03 | 1 | -0/+14 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'as/test-name-alias-uniquely' into maint | Junio C Hamano | 2013-01-11 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use longer alias names in subdirectory tests | Aaron Schrab | 2012-12-28 | 1 | -6/+6 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ja/directory-attrs' into maint | Junio C Hamano | 2013-01-11 | 1 | -0/+57 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add directory pattern matching to attributes | Jean-Noël AVILA | 2012-12-17 | 1 | -0/+57 |
* | | | | | | | | | | | Merge branch 'jc/fetch-ignore-symref' into maint | Junio C Hamano | 2013-01-11 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fetch: ignore wildcarded refspecs that update local symbolic refs | Junio C Hamano | 2012-12-11 | 1 | -0/+42 |