summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-quiltimport: flip the default not to allow fuzzje/quiltimport-no-fuzzJunio C Hamano2014-10-211-2/+24
* git-quiltimport.sh: allow declining fuzz with --exact optionJoern Engel2014-10-212-1/+28
* Update draft release notes to 2.2Junio C Hamano2014-09-191-12/+51
* Sync with Git 2.1.1Junio C Hamano2014-09-192-1/+46
|\
| * Git 2.1.1v2.1.1Junio C Hamano2014-09-194-3/+48
| * Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maintJunio C Hamano2014-09-191-1/+3
| |\
| * \ Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano2014-09-191-4/+6
| |\ \
| * \ \ Merge branch 'jk/prune-top-level-refs-after-packing' into maintJunio C Hamano2014-09-192-1/+9
| |\ \ \
| * \ \ \ Merge branch 'jk/fast-import-fixes' into maintJunio C Hamano2014-09-191-8/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2014-09-192-21/+27
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sp/pack-protocol-doc-on-shallow' into maintJunio C Hamano2014-09-191-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/prompt-stash-could-be-packed' into maintJunio C Hamano2014-09-191-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/refresh-beyond-symlink' into maintJunio C Hamano2014-09-192-0/+51
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'lf/bundle-exclusion' into maintJunio C Hamano2014-09-192-3/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-prefix' into maintJunio C Hamano2014-09-193-63/+96
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/command-line-config-empty-string' into maintJunio C Hamano2014-09-193-2/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pretty-empty-format' into maintJunio C Hamano2014-09-195-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fsck-exit-code-fix'Junio C Hamano2014-09-193-9/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fixJeff King2014-09-122-1/+58
| * | | | | | | | | | | | | | fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-103-8/+29
* | | | | | | | | | | | | | | Merge branch 'so/rebase-doc'Junio C Hamano2014-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation/git-rebase.txt: <upstream> must be given to specify <branch>so/rebase-docSergey Organov2014-09-161-1/+1
* | | | | | | | | | | | | | | | Merge branch 'ir/makefile-typofix'Junio C Hamano2014-09-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Makefile: fix some typos in the preambleir/makefile-typofixIan Liu Rodrigues2014-09-151-2/+2
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'wk/pre-push-sample-hook'Junio C Hamano2014-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pre-push.sample: Write error message to stderrwk/pre-push-sample-hookW. Trevor King2014-09-111-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'ss/compat-default-source-for-newer-gnu'Junio C Hamano2014-09-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | compat-util: add _DEFAULT_SOURCE definess/compat-default-source-for-newer-gnuSergey Senozhatsky2014-09-151-0/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mr/mark-i18n-log-rerere'Junio C Hamano2014-09-192-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | builtin/log.c: mark strings for translationmr/mark-i18n-log-rerereMatthias Ruester2014-09-151-5/+5
| * | | | | | | | | | | | | | | | | rerere.h: mark string for translationMatthias Ruester2014-09-151-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'js/no-test-cmp-for-binaries'Junio C Hamano2014-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t9300: use test_cmp_bin instead of test_cmp to compare binary filesjs/no-test-cmp-for-binariesJohannes Sixt2014-09-121-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix'Junio C Hamano2014-09-194-7/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fixJeff King2014-09-113-7/+21
| * | | | | | | | | | | | | | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-183-2/+22
* | | | | | | | | | | | | | | | | | Merge branch 'sp/doc-update-index-cacheinfo'Junio C Hamano2014-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Documentation: use single-parameter --cacheinfo in examplesp/doc-update-index-cacheinfoSteffen Prohaska2014-09-111-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/export-strbuf-addchars'Junio C Hamano2014-09-197-20/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | strbuf: use strbuf_addchars() for adding a char multiple timesrs/export-strbuf-addcharsRené Scharfe2014-09-083-13/+6
| * | | | | | | | | | | | | | | | | | | strbuf: export strbuf_addchars()René Scharfe2014-09-084-7/+12
* | | | | | | | | | | | | | | | | | | | Merge branch 'kb/perf-trace'Junio C Hamano2014-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | trace: correct trace_strbuf() parameter type for !HAVE_VARIADIC_MACROSkb/perf-traceRené Scharfe2014-09-081-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/parseopt-verify-short-name'Junio C Hamano2014-09-192-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | parse-options: detect attempt to add a duplicate short option namejc/parseopt-verify-short-nameJunio C Hamano2014-09-042-3/+15
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/reachable-protect-detached-head'Junio C Hamano2014-09-192-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | reachable.c: add HEAD to reachability starting commitsmk/reachable-protect-detached-headMax Kirillov2014-09-032-0/+25
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/complete-diff-ignore-blank-lines'Junio C Hamano2014-09-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | completion: Add --ignore-blank-lines for difftb/complete-diff-ignore-blank-linesThomas Braun2014-09-031-2/+2
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'as/calloc-takes-nmemb-then-size'Junio C Hamano2014-09-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \