Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rh/mergetool-regression-fix' | Junio C Hamano | 2017-01-18 |
|\ | |||
| * | mergetool: fix running in subdir when rerere enabled | Richard Hansen | 2017-01-10 |
| * | t7610: add test case for rerere+mergetool+subdir bug | Richard Hansen | 2017-01-10 |
| * | t7610: spell 'git reset --hard' consistently | Richard Hansen | 2017-01-10 |
| * | t7610: don't assume the checked-out commit | Richard Hansen | 2017-01-10 |
| * | t7610: always work on a test-specific branch | Richard Hansen | 2017-01-10 |
| * | t7610: delete some now-unnecessary 'git reset --hard' lines | Richard Hansen | 2017-01-10 |
| * | t7610: run 'git reset --hard' after each test to clean up | Richard Hansen | 2017-01-10 |
| * | t7610: don't rely on state from previous test | Richard Hansen | 2017-01-10 |
| * | t7610: use test_when_finished for cleanup tasks | Richard Hansen | 2017-01-10 |
| * | t7610: move setup code to the 'setup' test case | Richard Hansen | 2017-01-10 |
| * | t7610: update branch names to match test number | Richard Hansen | 2017-01-10 |
* | | Merge branch 'sb/pathspec-errors' | Junio C Hamano | 2017-01-18 |
|\ \ | |||
| * | | pathspec: give better message for submodule related pathspec error | Stefan Beller | 2017-01-09 |
* | | | Merge branch 'pb/test-must-fail-is-for-git' | Junio C Hamano | 2017-01-18 |
|\ \ \ | |||
| * | | | t9813: avoid using pipes | Pranit Bauva | 2017-01-09 |
| * | | | don't use test_must_fail with grep | Pranit Bauva | 2017-01-07 |
| |/ / | |||
* | | | Merge branch 'js/mingw-test-push-unc-path' | Junio C Hamano | 2017-01-18 |
|\ \ \ | |||
| * | | | mingw: add a regression test for pushing to UNC paths | Johannes Schindelin | 2017-01-07 |
* | | | | Merge branch 'km/branch-get-push-while-detached' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ | |||
| * | | | | branch_get_push: do not segfault when HEAD is detached | Kyle Meyer | 2017-01-07 |
* | | | | | Merge branch 'jk/blame-fixes' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ | |||
| * | | | | | blame: output porcelain "previous" header for each file | Jeff King | 2017-01-07 |
| * | | | | | blame: handle --no-abbrev | Jeff King | 2017-01-07 |
| * | | | | | blame: fix alignment with --abbrev=40 | Jeff King | 2017-01-07 |
* | | | | | | Merge branch 'jk/archive-zip-userdiff-config' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | archive-zip: load userdiff config | Jeff King | 2017-01-07 |
| |/ / / / / | |||
* | | | | | | Merge branch 'dt/disable-bitmap-in-auto-gc' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | repack: die on incremental + write-bitmap-index | David Turner | 2016-12-29 |
| * | | | | | | auto gc: don't write bitmaps for incremental repacks | David Turner | 2016-12-29 |
| |/ / / / / | |||
| * | | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-11-29 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'as/merge-attr-sleep' into maint | Junio C Hamano | 2016-11-29 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'mm/send-email-cc-cruft-after-address' into maint | Junio C Hamano | 2016-11-29 |
| |\ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ | Merge branch 'sb/submodule-rm-absorb' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | rm: absorb a submodules git dir before deletion | Stefan Beller | 2016-12-27 |
* | | | | | | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | grep: search history of moved submodules | Brandon Williams | 2016-12-22 |
| * | | | | | | | | | | grep: enable recurse-submodules to work on <tree> objects | Brandon Williams | 2016-12-22 |
| * | | | | | | | | | | grep: optionally recurse into submodules | Brandon Williams | 2016-12-22 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | submodule: add absorb-git-dir function | Stefan Beller | 2016-12-12 |
| * | | | | | | | | | test-lib-functions.sh: teach test_commit -C <dir> | Stefan Beller | 2016-12-09 |
* | | | | | | | | | | Merge branch 'mh/fast-import-notes-fix-new' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fast-import: properly fanout notes when tree is imported | Mike Hommey | 2016-12-20 |
| | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jc/compression-config' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | compression: unify pack.compression configuration parsing | Junio C Hamano | 2016-11-15 |
* | | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||
| * | | | | | | | | | | upload-pack: optionally allow fetching any sha1 | David Turner | 2016-11-18 |
| * | | | | | | | | | | remote-curl: don't hang when a server dies before any output | David Turner | 2016-11-18 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ \ \ \ |