Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mb/fast-import-delete-root' | Junio C Hamano | 2014-09-19 | 1 | -0/+104 |
|\ | |||||
| * | fast-import: fix segfault in store_tree()mb/fast-import-delete-root | Maxim Bublis | 2014-08-29 | 1 | -2/+2 |
| * | t9300: test filedelete command | Maxim Bublis | 2014-08-29 | 1 | -0/+104 |
* | | Merge branch 'bb/date-iso-strict' | Junio C Hamano | 2014-09-19 | 1 | -0/+8 |
|\ \ | |||||
| * | | pretty: provide a strict ISO 8601 date formatbb/date-iso-strict | Beat Bolli | 2014-08-29 | 1 | -0/+8 |
* | | | Merge branch 'jk/fast-export-anonymize' | Junio C Hamano | 2014-09-19 | 1 | -0/+112 |
|\ \ \ | |||||
| * | | | teach fast-export an --anonymize option | Jeff King | 2014-08-27 | 1 | -0/+112 |
| |/ / | |||||
* | | | Merge branch 'jk/send-pack-many-refspecs' | Junio C Hamano | 2014-09-19 | 2 | -0/+107 |
|\ \ \ | |||||
| * | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecs | Jeff King | 2014-08-26 | 2 | -0/+107 |
| | |/ | |/| | |||||
* | | | git svn: info: correctly handle absolute path args | Eric Wong | 2014-09-14 | 1 | -0/+30 |
* | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' | Junio C Hamano | 2014-09-11 | 1 | -0/+17 |
|\ \ \ | |||||
| * | | | checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletion | Jonathan Nieder | 2014-08-25 | 1 | -0/+17 |
* | | | | Merge branch 'jk/prune-top-level-refs-after-packing' | Junio C Hamano | 2014-09-11 | 1 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | pack-refs: prune top-level refs like "refs/foo"jk/prune-top-level-refs-after-packing | Jeff King | 2014-08-25 | 1 | -0/+7 |
* | | | | | Merge branch 'nd/large-blobs' | Junio C Hamano | 2014-09-11 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | diff: shortcut for diff'ing two binary SHA-1 objectsnd/large-blobs | Nguyễn Thái Ngọc Duy | 2014-08-18 | 1 | -0/+10 |
| * | | | | | diff --stat: mark any file larger than core.bigfilethreshold binary | Nguyễn Thái Ngọc Duy | 2014-08-18 | 1 | -0/+4 |
| * | | | | | sha1_file.c: do not die failing to malloc in unpack_compressed_entry | Nguyễn Thái Ngọc Duy | 2014-08-18 | 1 | -0/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'dt/cache-tree-repair' | Junio C Hamano | 2014-09-11 | 1 | -17/+145 |
|\ \ \ \ \ | |||||
| * | | | | | cache-tree: do not try to use an invalidated subtree info to build a tree | Junio C Hamano | 2014-09-03 | 1 | -0/+8 |
| * | | | | | cache-tree: Write updated cache-tree after commit | David Turner | 2014-07-14 | 1 | -15/+102 |
| * | | | | | cache-tree: subdirectory tests | David Turner | 2014-07-11 | 1 | -3/+23 |
| * | | | | | cache-tree: create/update cache-tree on checkout | David Turner | 2014-07-07 | 1 | -3/+16 |
* | | | | | | Merge branch 'ta/config-set-1' | Junio C Hamano | 2014-09-11 | 2 | -1/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add tests for `git_config_get_string_const()`ta/config-set-1 | Tanay Abhra | 2014-08-07 | 1 | -0/+10 |
| * | | | | | | add a test for semantic errors in config files | Tanay Abhra | 2014-08-07 | 1 | -0/+11 |
| * | | | | | | rewrite git_config() to use the config-set API | Tanay Abhra | 2014-08-07 | 1 | -1/+1 |
* | | | | | | | Merge branch 'nd/strbuf-utf8-replace' | Junio C Hamano | 2014-09-09 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | utf8.c: fix strbuf_utf8_replace() consuming data beyond input stringnd/strbuf-utf8-replace | Nguyễn Thái Ngọc Duy | 2014-08-11 | 1 | -0/+7 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/refresh-beyond-symlink' | Junio C Hamano | 2014-09-09 | 1 | -0/+43 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | read-cache: check for leading symlinks when refreshing indexrs/refresh-beyond-symlink | René Scharfe | 2014-08-10 | 1 | -0/+43 |
* | | | | | | | | Merge branch 'jk/stash-list-p' | Junio C Hamano | 2014-09-09 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | stash: default listing to working-tree diffjk/stash-list-p | Jeff King | 2014-08-07 | 1 | -0/+42 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'lf/bundle-exclusion' | Junio C Hamano | 2014-09-09 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bundle: fix exclusion of annotated tagslf/bundle-exclusion | Lukas Fleischer | 2014-08-07 | 1 | -1/+4 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/apply-ws-prefix' | Junio C Hamano | 2014-09-09 | 2 | -0/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefix | 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' | Junio C Hamano | 2014-09-09 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-string | Junio C Hamano | 2014-08-05 | 1 | -0/+11 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/not-mingw-cygwin' | Junio C Hamano | 2014-09-09 | 15 | -60/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | test prerequisites: enumerate with commasjc/not-mingw-cygwin | Junio C Hamano | 2014-07-21 | 2 | -9/+9 |
| * | | | | | | | | test prerequisites: eradicate NOT_FOO | Junio C Hamano | 2014-07-21 | 15 | -60/+56 |
* | | | | | | | | | Merge branch 'bc/archive-pax-header-mode' | Junio C Hamano | 2014-09-02 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | archive: honor tar.umask even for pax headersbc/archive-pax-header-mode | brian m. carlson | 2014-08-04 | 1 | -0/+5 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ta/config-set' | Junio C Hamano | 2014-09-02 | 1 | -0/+200 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | test-config: add tests for the config_set API | Tanay Abhra | 2014-07-29 | 1 | -0/+200 |
* | | | | | | | | Merge branch 'jk/diff-tree-t-fix' | Junio C Hamano | 2014-08-26 | 1 | -0/+34 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fix | Jeff King | 2014-08-20 | 1 | -0/+34 |