Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'ir/makefile-typofix' | Junio C Hamano | 2014-09-19 |
|\ | |||
| * | Makefile: fix some typos in the preamble | Ian Liu Rodrigues | 2014-09-15 |
* | | Merge branch 'wk/pre-push-sample-hook' | Junio C Hamano | 2014-09-19 |
|\ \ | |||
| * | | pre-push.sample: Write error message to stderr | W. Trevor King | 2014-09-11 |
* | | | Merge branch 'ss/compat-default-source-for-newer-gnu' | Junio C Hamano | 2014-09-19 |
|\ \ \ | |||
| * | | | compat-util: add _DEFAULT_SOURCE define | Sergey Senozhatsky | 2014-09-15 |
| | |/ | |/| | |||
* | | | Merge branch 'mr/mark-i18n-log-rerere' | Junio C Hamano | 2014-09-19 |
|\ \ \ | |||
| * | | | builtin/log.c: mark strings for translation | Matthias Ruester | 2014-09-15 |
| * | | | rerere.h: mark string for translation | Matthias Ruester | 2014-09-15 |
| |/ / | |||
* | | | Merge branch 'js/no-test-cmp-for-binaries' | Junio C Hamano | 2014-09-19 |
|\ \ \ | |||
| * | | | t9300: use test_cmp_bin instead of test_cmp to compare binary files | Johannes Sixt | 2014-09-12 |
| |/ / | |||
* | | | Merge branch 'ta/config-add-to-empty-or-true-fix' | Junio C Hamano | 2014-09-19 |
|\ \ \ | |||
| * | | | config: avoid a funny sentinel value "a^" | Jeff King | 2014-09-11 |
| * | | | make config --add behave correctly for empty and NULL values | Tanay Abhra | 2014-08-18 |
* | | | | Merge branch 'sp/doc-update-index-cacheinfo' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ | |||
| * | | | | Documentation: use single-parameter --cacheinfo in example | Steffen Prohaska | 2014-09-11 |
* | | | | | Merge branch 'rs/export-strbuf-addchars' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ | |||
| * | | | | | strbuf: use strbuf_addchars() for adding a char multiple times | René Scharfe | 2014-09-08 |
| * | | | | | strbuf: export strbuf_addchars() | René Scharfe | 2014-09-08 |
* | | | | | | Merge branch 'kb/perf-trace' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ | |||
| * | | | | | | trace: correct trace_strbuf() parameter type for !HAVE_VARIADIC_MACROS | René Scharfe | 2014-09-08 |
* | | | | | | | Merge branch 'jc/parseopt-verify-short-name' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | parse-options: detect attempt to add a duplicate short option name | Junio C Hamano | 2014-09-04 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'mk/reachable-protect-detached-head' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | reachable.c: add HEAD to reachability starting commits | Max Kirillov | 2014-09-03 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'tb/complete-diff-ignore-blank-lines' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | completion: Add --ignore-blank-lines for diff | Thomas Braun | 2014-09-03 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'as/calloc-takes-nmemb-then-size' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | calloc() and xcalloc() takes nmemb and then size | Arjun Sreedharan | 2014-09-03 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'tb/crlf-tests' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | MinGW: update tests to handle a native eol of crlf | Brice Lambson | 2014-09-02 |
| * | | | | | | | Makefile: propagate NATIVE_CRLF to C | Pat Thoyts | 2014-09-02 |
| * | | | | | | | t0027: Tests for core.eol=native, eol=lf, eol=crlf | Torsten Bögershausen | 2014-08-28 |
* | | | | | | | | Merge branch 'rs/simplify-http-walker' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | http-walker: simplify process_alternates_response() using strbuf | René Scharfe | 2014-09-02 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'rs/simplify-config-include' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | config: simplify git_config_include() | René Scharfe | 2014-09-02 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'rs/merge-tree-simplify' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | merge-tree: remove unused df_conflict arguments | René Scharfe | 2014-09-02 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'da/styles' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | stylefix: asterisks stick to the variable, not the type | David Aguilar | 2014-09-02 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'ah/grammofix' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | grammofix in user-facing messages | Alex Henrie | 2014-09-02 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'rs/more-uses-of-skip-prefix' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt() | René Scharfe | 2014-09-02 |
| * | | | | | | | | connect: simplify check_ref() using skip_prefix() and starts_with() | René Scharfe | 2014-09-02 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'mb/fast-import-delete-root' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | fast-import: fix segfault in store_tree() | Maxim Bublis | 2014-08-29 |
| * | | | | | | | | t9300: test filedelete command | Maxim Bublis | 2014-08-29 |
* | | | | | | | | | Merge branch 'jp/index-with-corrupt-stages' | Junio C Hamano | 2014-09-19 |
|\ \ \ \ \ \ \ \ \ |