Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-quiltimport: flip the default not to allow fuzzje/quiltimport-no-fuzz | Junio C Hamano | 2014-10-21 | 1 | -2/+24 |
* | git-quiltimport.sh: allow declining fuzz with --exact option | Joern Engel | 2014-10-21 | 2 | -1/+28 |
* | Update draft release notes to 2.2 | Junio C Hamano | 2014-09-19 | 1 | -12/+51 |
* | Sync with Git 2.1.1 | Junio C Hamano | 2014-09-19 | 2 | -1/+46 |
|\ | |||||
| * | Git 2.1.1v2.1.1 | Junio C Hamano | 2014-09-19 | 4 | -3/+48 |
| * | Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+3 |
| |\ | |||||
| * \ | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maint | Junio C Hamano | 2014-09-19 | 1 | -4/+6 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/prune-top-level-refs-after-packing' into maint | Junio C Hamano | 2014-09-19 | 2 | -1/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/fast-import-fixes' into maint | Junio C Hamano | 2014-09-19 | 1 | -8/+13 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint | Junio C Hamano | 2014-09-19 | 2 | -21/+27 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sp/pack-protocol-doc-on-shallow' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/prompt-stash-could-be-packed' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rs/refresh-beyond-symlink' into maint | Junio C Hamano | 2014-09-19 | 2 | -0/+51 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'lf/bundle-exclusion' into maint | Junio C Hamano | 2014-09-19 | 2 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-prefix' into maint | Junio C Hamano | 2014-09-19 | 3 | -63/+96 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/command-line-config-empty-string' into maint | Junio C Hamano | 2014-09-19 | 3 | -2/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pretty-empty-format' into maint | Junio C Hamano | 2014-09-19 | 5 | -6/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fsck-exit-code-fix' | Junio C Hamano | 2014-09-19 | 3 | -9/+87 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fix | Jeff King | 2014-09-12 | 2 | -1/+58 |
| * | | | | | | | | | | | | | | fsck: exit with non-zero status upon error from fsck_obj() | Jeff King | 2014-09-10 | 3 | -8/+29 |
* | | | | | | | | | | | | | | | Merge branch 'so/rebase-doc' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Documentation/git-rebase.txt: <upstream> must be given to specify <branch>so/rebase-doc | Sergey Organov | 2014-09-16 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'ir/makefile-typofix' | Junio C Hamano | 2014-09-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Makefile: fix some typos in the preambleir/makefile-typofix | Ian Liu Rodrigues | 2014-09-15 | 1 | -2/+2 |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'wk/pre-push-sample-hook' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | pre-push.sample: Write error message to stderrwk/pre-push-sample-hook | W. Trevor King | 2014-09-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'ss/compat-default-source-for-newer-gnu' | Junio C Hamano | 2014-09-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | compat-util: add _DEFAULT_SOURCE definess/compat-default-source-for-newer-gnu | Sergey Senozhatsky | 2014-09-15 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'mr/mark-i18n-log-rerere' | Junio C Hamano | 2014-09-19 | 2 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | builtin/log.c: mark strings for translationmr/mark-i18n-log-rerere | Matthias Ruester | 2014-09-15 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | | rerere.h: mark string for translation | Matthias Ruester | 2014-09-15 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'js/no-test-cmp-for-binaries' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t9300: use test_cmp_bin instead of test_cmp to compare binary filesjs/no-test-cmp-for-binaries | Johannes Sixt | 2014-09-12 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' | Junio C Hamano | 2014-09-19 | 4 | -7/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fix | Jeff King | 2014-09-11 | 3 | -7/+21 |
| * | | | | | | | | | | | | | | | | | make config --add behave correctly for empty and NULL values | Tanay Abhra | 2014-08-18 | 3 | -2/+22 |
* | | | | | | | | | | | | | | | | | | Merge branch 'sp/doc-update-index-cacheinfo' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Documentation: use single-parameter --cacheinfo in examplesp/doc-update-index-cacheinfo | Steffen Prohaska | 2014-09-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs/export-strbuf-addchars' | Junio C Hamano | 2014-09-19 | 7 | -20/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | strbuf: use strbuf_addchars() for adding a char multiple timesrs/export-strbuf-addchars | René Scharfe | 2014-09-08 | 3 | -13/+6 |
| * | | | | | | | | | | | | | | | | | | | strbuf: export strbuf_addchars() | René Scharfe | 2014-09-08 | 4 | -7/+12 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/perf-trace' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | trace: correct trace_strbuf() parameter type for !HAVE_VARIADIC_MACROSkb/perf-trace | René Scharfe | 2014-09-08 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/parseopt-verify-short-name' | Junio C Hamano | 2014-09-19 | 2 | -3/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | parse-options: detect attempt to add a duplicate short option namejc/parseopt-verify-short-name | Junio C Hamano | 2014-09-04 | 2 | -3/+15 |
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/reachable-protect-detached-head' | Junio C Hamano | 2014-09-19 | 2 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | reachable.c: add HEAD to reachability starting commitsmk/reachable-protect-detached-head | Max Kirillov | 2014-09-03 | 2 | -0/+25 |
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/complete-diff-ignore-blank-lines' | Junio C Hamano | 2014-09-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | completion: Add --ignore-blank-lines for difftb/complete-diff-ignore-blank-lines | Thomas Braun | 2014-09-03 | 1 | -2/+2 |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/calloc-takes-nmemb-then-size' | Junio C Hamano | 2014-09-19 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |