Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rs/checkout-init-macro' | Junio C Hamano | 2016-09-26 |
|\ | |||
| * | introduce CHECKOUT_INIT | René Scharfe | 2016-09-22 |
* | | Merge branch 'ls/travis-homebrew-path-fix' | Junio C Hamano | 2016-09-26 |
|\ \ | |||
| * | | travis-ci: ask homebrew for its path instead of hardcoding it | Lars Schneider | 2016-09-22 |
* | | | Merge branch 'tg/add-chmod+x-fix' | Junio C Hamano | 2016-09-26 |
|\ \ \ | |||
| * | | | t3700-add: do not check working tree file mode without POSIXPERM | Johannes Sixt | 2016-09-21 |
| * | | | t3700-add: create subdirectory gently | Johannes Sixt | 2016-09-21 |
| * | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 |
| * | | | read-cache: introduce chmod_index_entry | Thomas Gummerer | 2016-09-15 |
| * | | | update-index: add test for chmod flags | Thomas Gummerer | 2016-09-14 |
| * | | | Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix | Junio C Hamano | 2016-09-14 |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'js/regexec-buf' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ | |||
| * | | | | | regex: use regexec_buf() | Johannes Schindelin | 2016-09-21 |
| * | | | | | regex: add regexec_buf() that can work on a non NUL-terminated string | Johannes Schindelin | 2016-09-21 |
| * | | | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and fails | Johannes Schindelin | 2016-09-21 |
* | | | | | | Merge branch 'nd/checkout-disambiguation' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ | |||
| * | | | | | | checkout: fix ambiguity check in subdir | Nguyễn Thái Ngọc Duy | 2016-09-21 |
| * | | | | | | checkout.txt: document a common case that ignores ambiguation rules | Nguyễn Thái Ngọc Duy | 2016-09-21 |
| * | | | | | | checkout: add some spaces between code and comment | Nguyễn Thái Ngọc Duy | 2016-09-08 |
* | | | | | | | Merge branch 'va/i18n-more' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | i18n: stash: mark messages for translation | Vasco Almeida | 2016-09-21 |
| * | | | | | | | i18n: notes-merge: mark die messages for translation | Vasco Almeida | 2016-09-21 |
| * | | | | | | | i18n: ident: mark hint for translation | Vasco Almeida | 2016-09-21 |
| * | | | | | | | i18n: i18n: diff: mark die messages for translation | Jean-Noël AVILA | 2016-09-21 |
| * | | | | | | | i18n: connect: mark die messages for translation | Vasco Almeida | 2016-09-19 |
| * | | | | | | | i18n: commit: mark message for translation | Vasco Almeida | 2016-09-19 |
* | | | | | | | | Merge branch 'jt/format-patch-rfc' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH] | Josh Triplett | 2016-09-21 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'ep/doc-check-ref-format-example' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-check-ref-format.txt: fixup documentation | Elia Pinto | 2016-09-21 |
* | | | | | | | | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | blame: honor the diff heuristic options and config | Michael Haggerty | 2016-09-19 |
| * | | | | | | | | | parse-options: add parse_opt_unknown_cb() | Michael Haggerty | 2016-09-19 |
| * | | | | | | | | | diff: improve positioning of add/delete blocks in diffs | Michael Haggerty | 2016-09-19 |
| * | | | | | | | | | xdl_change_compact(): introduce the concept of a change group | Michael Haggerty | 2016-08-23 |
| * | | | | | | | | | recs_match(): take two xrecord_t pointers as arguments | Michael Haggerty | 2016-08-23 |
| * | | | | | | | | | is_blank_line(): take a single xrecord_t as argument | Michael Haggerty | 2016-08-23 |
| * | | | | | | | | | xdl_change_compact(): only use heuristic if group can't be matched | Michael Haggerty | 2016-08-23 |
| * | | | | | | | | | xdl_change_compact(): fix compaction heuristic to adjust ixo | Michael Haggerty | 2016-08-23 |
* | | | | | | | | | | Merge branch 'rs/c-auto-resets-attributes' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | pretty: let %C(auto) reset all attributes | René Scharfe | 2016-09-19 |
* | | | | | | | | | | | Merge branch 'mm/config-color-ui-default-to-auto' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Documentation/config: default for color.* is color.ui | Matthieu Moy | 2016-09-16 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||
| * | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2 | René Scharfe | 2016-09-15 |
| * | | | | | | | | | | add coccicheck make target | René Scharfe | 2016-09-15 |
| * | | | | | | | | | | contrib/coccinelle: fix semantic patch for oid_to_hex_r() | René Scharfe | 2016-09-15 |
* | | | | | | | | | | | Fourth batch for 2.11 | Junio C Hamano | 2016-09-21 |
* | | | | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' | Junio C Hamano | 2016-09-21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | gc: default aggressive depth to 50 | Jeff King | 2016-08-11 |