aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ls/travis-homebrew-path-fix'Junio C Hamano2016-09-26
|\
| * travis-ci: ask homebrew for its path instead of hardcoding itLars Schneider2016-09-22
* | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-26
|\ \
| * | t3700-add: do not check working tree file mode without POSIXPERMJohannes Sixt2016-09-21
| * | t3700-add: create subdirectory gentlyJohannes Sixt2016-09-21
| * | add: modify already added files when --chmod is givenThomas Gummerer2016-09-15
| * | read-cache: introduce chmod_index_entryThomas Gummerer2016-09-15
| * | update-index: add test for chmod flagsThomas Gummerer2016-09-14
| * | Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fixJunio C Hamano2016-09-14
| |\ \
* | \ \ Merge branch 'js/regexec-buf'Junio C Hamano2016-09-26
|\ \ \ \
| * | | | regex: use regexec_buf()Johannes Schindelin2016-09-21
| * | | | regex: add regexec_buf() that can work on a non NUL-terminated stringJohannes Schindelin2016-09-21
| * | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and failsJohannes Schindelin2016-09-21
* | | | | Merge branch 'nd/checkout-disambiguation'Junio C Hamano2016-09-26
|\ \ \ \ \
| * | | | | checkout: fix ambiguity check in subdirNguyễn Thái Ngọc Duy2016-09-21
| * | | | | checkout.txt: document a common case that ignores ambiguation rulesNguyễn Thái Ngọc Duy2016-09-21
| * | | | | checkout: add some spaces between code and commentNguyễn Thái Ngọc Duy2016-09-08
* | | | | | Merge branch 'va/i18n-more'Junio C Hamano2016-09-26
|\ \ \ \ \ \
| * | | | | | i18n: stash: mark messages for translationVasco Almeida2016-09-21
| * | | | | | i18n: notes-merge: mark die messages for translationVasco Almeida2016-09-21
| * | | | | | i18n: ident: mark hint for translationVasco Almeida2016-09-21
| * | | | | | i18n: i18n: diff: mark die messages for translationJean-Noël AVILA2016-09-21
| * | | | | | i18n: connect: mark die messages for translationVasco Almeida2016-09-19
| * | | | | | i18n: commit: mark message for translationVasco Almeida2016-09-19
* | | | | | | Merge branch 'jt/format-patch-rfc'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \
| * | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH]Josh Triplett2016-09-21
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ep/doc-check-ref-format-example'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \
| * | | | | | | git-check-ref-format.txt: fixup documentationElia Pinto2016-09-21
* | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-19
| * | | | | | | | parse-options: add parse_opt_unknown_cb()Michael Haggerty2016-09-19
| * | | | | | | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-19
| * | | | | | | | xdl_change_compact(): introduce the concept of a change groupMichael Haggerty2016-08-23
| * | | | | | | | recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty2016-08-23
| * | | | | | | | is_blank_line(): take a single xrecord_t as argumentMichael Haggerty2016-08-23
| * | | | | | | | xdl_change_compact(): only use heuristic if group can't be matchedMichael Haggerty2016-08-23
| * | | | | | | | xdl_change_compact(): fix compaction heuristic to adjust ixoMichael Haggerty2016-08-23
* | | | | | | | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pretty: let %C(auto) reset all attributesRené Scharfe2016-09-19
* | | | | | | | | | Merge branch 'mm/config-color-ui-default-to-auto'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/config: default for color.* is color.uiMatthieu Moy2016-09-16
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-15
| * | | | | | | | | | add coccicheck make targetRené Scharfe2016-09-15
| * | | | | | | | | | contrib/coccinelle: fix semantic patch for oid_to_hex_r()René Scharfe2016-09-15
* | | | | | | | | | | Fourth batch for 2.11Junio C Hamano2016-09-21
* | | | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth'Junio C Hamano2016-09-21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gc: default aggressive depth to 50Jeff King2016-08-11
* | | | | | | | | | | | Merge branch 'jk/rebase-i-drop-ident-check'Junio C Hamano2016-09-21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase-interactive: drop early check for valid identJeff King2016-07-29