Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint | Junio C Hamano | 2014-10-29 | 1 | -0/+9 |
|\ | |||||
| * | pack-objects: turn off bitmaps when we split packs | Jeff King | 2014-10-20 | 1 | -0/+9 |
* | | Merge branch 'jk/mbox-from-line' into maint | Junio C Hamano | 2014-10-07 | 5 | -0/+49 |
|\ \ | |||||
| * | | mailinfo: make ">From" in-body header check more robust | Jeff King | 2014-09-16 | 5 | -0/+49 |
* | | | Merge branch 'jk/fsck-exit-code-fix' into maint | Junio C Hamano | 2014-09-30 | 2 | -7/+83 |
|\ \ \ | |||||
| * | | | fsck: return non-zero status on missing ref tips | Jeff King | 2014-09-12 | 1 | -0/+56 |
| * | | | fsck: exit with non-zero status upon error from fsck_obj() | Jeff King | 2014-09-10 | 2 | -7/+27 |
* | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maint | Junio C Hamano | 2014-09-30 | 1 | -0/+20 |
|\ \ \ \ | |||||
| * | | | | make config --add behave correctly for empty and NULL values | Tanay Abhra | 2014-08-18 | 1 | -0/+20 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'mk/reachable-protect-detached-head' into maint | Junio C Hamano | 2014-09-30 | 1 | -0/+22 |
|\ \ \ \ | |||||
| * | | | | reachable.c: add HEAD to reachability starting commits | Max Kirillov | 2014-09-03 | 1 | -0/+22 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'mb/fast-import-delete-root' into maint | Junio C Hamano | 2014-09-30 | 1 | -0/+104 |
|\ \ \ \ | |||||
| * | | | | fast-import: fix segfault in store_tree() | Maxim Bublis | 2014-08-29 | 1 | -2/+2 |
| * | | | | t9300: test filedelete command | Maxim Bublis | 2014-08-29 | 1 | -0/+104 |
| |/ / / | |||||
* | | | | Merge branch 'jk/send-pack-many-refspecs' into maint | Junio C Hamano | 2014-09-30 | 2 | -0/+107 |
|\ \ \ \ | |||||
| * | | | | send-pack: take refspecs over stdin | Jeff King | 2014-08-26 | 2 | -0/+107 |
| |/ / / | |||||
* | | | | Merge branch 'jk/prune-top-level-refs-after-packing' into maint | Junio C Hamano | 2014-09-19 | 1 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | pack-refs: prune top-level refs like "refs/foo" | Jeff King | 2014-08-25 | 1 | -0/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint | Junio C Hamano | 2014-09-19 | 1 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | checkout -m: attempt merge when deletion of path was staged | Jonathan Nieder | 2014-08-26 | 1 | -0/+17 |
* | | | | | Merge branch 'rs/refresh-beyond-symlink' into maint | Junio C Hamano | 2014-09-19 | 1 | -0/+43 |
|\ \ \ \ \ | |||||
| * | | | | | read-cache: check for leading symlinks when refreshing index | René Scharfe | 2014-08-10 | 1 | -0/+43 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'lf/bundle-exclusion' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | bundle: fix exclusion of annotated tags | Lukas Fleischer | 2014-08-08 | 1 | -1/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jc/apply-ws-prefix' into maint | Junio C Hamano | 2014-09-19 | 2 | -0/+28 |
|\ \ \ \ \ | |||||
| * | | | | | apply: omit ws check for excluded paths | Junio C Hamano | 2014-08-07 | 1 | -0/+11 |
| * | | | | | apply: use the right attribute for paths in non-Git patches | Junio C Hamano | 2014-08-07 | 1 | -0/+17 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2014-07-16 | 1 | -2/+2 |
| |\| | | | |||||
* | | | | | Merge branch 'jk/command-line-config-empty-string' into maint | Junio C Hamano | 2014-09-19 | 1 | -0/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | config: teach "git -c" to recognize an empty string | Junio C Hamano | 2014-08-05 | 1 | -0/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jk/diff-tree-t-fix' | Junio C Hamano | 2014-08-26 | 1 | -0/+34 |
|\ \ \ \ | |||||
| * | | | | intersect_paths: respect mode in git's tree-sort | Jeff King | 2014-08-20 | 1 | -0/+34 |
* | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap' | Junio C Hamano | 2014-08-26 | 1 | -0/+39 |
|\ \ \ \ \ | |||||
| * | | | | | pack-objects: turn off bitmaps when we see --shallow lines | Jeff King | 2014-08-12 | 1 | -0/+39 |
* | | | | | | tests: fix negated test_i18ngrep calls | Johannes Sixt | 2014-08-13 | 3 | -6/+6 |
* | | | | | | Sync with 2.0.4 | Junio C Hamano | 2014-07-30 | 1 | -0/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | commit --amend: test specifies authorship but forgets to check | Fabian Ruch | 2014-07-30 | 1 | -0/+1 |
* | | | | | | Merge branch 'sk/mingw-tests-workaround' | Junio C Hamano | 2014-07-30 | 8 | -24/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t800[12]: work around MSys limitation | Karsten Blees | 2014-07-21 | 1 | -0/+12 |
| * | | | | | | t9902: mingw-specific fix for gitfile link files | Pat Thoyts | 2014-07-21 | 1 | -4/+13 |
| * | | | | | | t4210: skip command-line encoding tests on mingw | Pat Thoyts | 2014-07-21 | 1 | -2/+2 |
| * | | | | | | MinGW: disable legacy encoding tests | Karsten Blees | 2014-07-21 | 3 | -15/+18 |
| * | | | | | | t0110/MinGW: skip tests that pass arbitrary bytes on the command line | Karsten Blees | 2014-07-21 | 1 | -2/+5 |
| * | | | | | | MinGW: Skip test redirecting to fd 4 | Johannes Schindelin | 2014-07-17 | 1 | -1/+1 |
* | | | | | | | Merge branch 'sk/mingw-uni-fix-more' | Junio C Hamano | 2014-07-30 | 4 | -7/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tests: do not pass iso8859-1 encoded parameter | Pat Thoyts | 2014-07-15 | 4 | -7/+13 |
* | | | | | | | | Merge branch 'ep/avoid-test-a-o' | Junio C Hamano | 2014-07-30 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t9814: fix misconversion from test $a -o $b to test $a || test $b | Junio C Hamano | 2014-07-25 | 1 | -2/+8 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2014-07-28 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | t4013: test diff-tree's --stdin commit formatting | Jeff King | 2014-07-28 | 1 | -0/+10 |