Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | calloc() and xcalloc() takes nmemb and then sizeas/calloc-takes-nmemb-then-size | Arjun Sreedharan | 2014-09-03 | 2 | -2/+2 | |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/crlf-tests' | Junio C Hamano | 2014-09-19 | 5 | -120/+178 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | MinGW: update tests to handle a native eol of crlftb/crlf-tests | Brice Lambson | 2014-09-02 | 2 | -20/+35 | |
| * | | | | | | | | | | | | | | | | | | | | | | Makefile: propagate NATIVE_CRLF to C | Pat Thoyts | 2014-09-02 | 2 | -0/+23 | |
| * | | | | | | | | | | | | | | | | | | | | | | t0027: Tests for core.eol=native, eol=lf, eol=crlf | Torsten Bögershausen | 2014-08-28 | 1 | -100/+120 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/simplify-http-walker' | Junio C Hamano | 2014-09-19 | 1 | -9/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | http-walker: simplify process_alternates_response() using strbufrs/simplify-http-walker | René Scharfe | 2014-09-02 | 1 | -9/+6 | |
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/simplify-config-include' | Junio C Hamano | 2014-09-19 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | config: simplify git_config_include()rs/simplify-config-include | René Scharfe | 2014-09-02 | 1 | -5/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/merge-tree-simplify' | Junio C Hamano | 2014-09-19 | 1 | -12/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | merge-tree: remove unused df_conflict argumentsrs/merge-tree-simplify | René Scharfe | 2014-09-02 | 1 | -12/+6 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/styles' | Junio C Hamano | 2014-09-19 | 7 | -9/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | stylefix: asterisks stick to the variable, not the typeda/styles | David Aguilar | 2014-09-02 | 7 | -9/+10 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/grammofix' | Junio C Hamano | 2014-09-19 | 8 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | grammofix in user-facing messagesah/grammofix | Alex Henrie | 2014-09-02 | 8 | -10/+10 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/more-uses-of-skip-prefix' | Junio C Hamano | 2014-09-19 | 2 | -16/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt()rs/further-uses-of-skip-prefixrs/furhter-uses-of-skip-prefix | René Scharfe | 2014-09-02 | 1 | -6/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | connect: simplify check_ref() using skip_prefix() and starts_with() | René Scharfe | 2014-09-02 | 1 | -10/+6 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mb/fast-import-delete-root' | Junio C Hamano | 2014-09-19 | 2 | -1/+109 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | fast-import: fix segfault in store_tree()mb/fast-import-delete-root | Maxim Bublis | 2014-08-29 | 2 | -3/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | t9300: test filedelete command | Maxim Bublis | 2014-08-29 | 1 | -0/+104 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jp/index-with-corrupt-stages' | Junio C Hamano | 2014-09-19 | 1 | -1/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |