summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mailinfo: fix in-body header continuationslt/mailinfo-in-body-header-continuationLinus Torvalds2017-04-112-3/+10
* Merge branch 'jt/mailinfo-fold-in-body-headers'Junio C Hamano2016-09-2912-36/+159
|\
| * mailinfo: handle in-body header continuationsJonathan Tan2016-09-2112-4/+125
| * mailinfo: make is_scissors_line take plain char *Jonathan Tan2016-09-191-17/+18
| * mailinfo: separate in-body header processingJonathan Tan2016-09-191-16/+17
* | Fifth batch for 2.11Junio C Hamano2016-09-261-0/+66
* | Merge branch 'jk/clone-recursive-progress'Junio C Hamano2016-09-263-5/+34
|\ \
| * | clone: pass --progress decision to recursive submodulesjk/clone-recursive-progressJeff King2016-09-223-5/+34
* | | Merge branch 'jk/doc-cvs-update'Junio C Hamano2016-09-262-2/+6
|\ \ \
| * | | docs/cvs-migration: mention cvsimport caveatsjk/doc-cvs-updateJeff King2016-09-221-0/+4
| * | | docs/cvs-migration: update link to cvsps homepageJeff King2016-09-221-1/+1
| * | | docs/cvsimport: prefer cvs-fast-export to parsecvsJeff King2016-09-221-1/+1
* | | | Merge branch 'rt/rebase-i-broken-insn-advise'Junio C Hamano2016-09-262-4/+4
|\ \ \ \
| * | | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-adviseRalf Thielow2016-09-072-4/+4
* | | | | Merge branch 'rs/checkout-init-macro'Junio C Hamano2016-09-265-9/+5
|\ \ \ \ \
| * | | | | introduce CHECKOUT_INITrs/checkout-init-macroRené Scharfe2016-09-225-9/+5
* | | | | | Merge branch 'ls/travis-homebrew-path-fix'Junio C Hamano2016-09-261-1/+1
|\ \ \ \ \ \
| * | | | | | travis-ci: ask homebrew for its path instead of hardcoding itls/travis-homebrew-path-fixLars Schneider2016-09-221-1/+1
* | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-268-49/+136
|\ \ \ \ \ \ \
| * | | | | | | t3700-add: do not check working tree file mode without POSIXPERMJohannes Sixt2016-09-211-4/+2
| * | | | | | | t3700-add: create subdirectory gentlyJohannes Sixt2016-09-211-1/+1
| * | | | | | | add: modify already added files when --chmod is givenThomas Gummerer2016-09-156-34/+91
| * | | | | | | read-cache: introduce chmod_index_entryThomas Gummerer2016-09-153-14/+33
| * | | | | | | update-index: add test for chmod flagsThomas Gummerer2016-09-142-1/+14
| * | | | | | | Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fixJunio C Hamano2016-09-141-39/+26
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'js/regexec-buf'Junio C Hamano2016-09-267-33/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | regex: use regexec_buf()Johannes Schindelin2016-09-215-33/+17
| * | | | | | | | | regex: add regexec_buf() that can work on a non NUL-terminated stringJohannes Schindelin2016-09-212-1/+15
| * | | | | | | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and failsJohannes Schindelin2016-09-211-0/+22
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/checkout-disambiguation'Junio C Hamano2016-09-264-3/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguationNguyễn Thái Ngọc Duy2016-09-213-2/+23
| * | | | | | | | | checkout.txt: document a common case that ignores ambiguation rulesNguyễn Thái Ngọc Duy2016-09-211-0/+12
| * | | | | | | | | checkout: add some spaces between code and commentNguyễn Thái Ngọc Duy2016-09-081-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'va/i18n-more'Junio C Hamano2016-09-2610-43/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | i18n: stash: mark messages for translationva/i18n-moreVasco Almeida2016-09-211-3/+3
| * | | | | | | | | i18n: notes-merge: mark die messages for translationVasco Almeida2016-09-212-5/+5
| * | | | | | | | | i18n: ident: mark hint for translationVasco Almeida2016-09-211-16/+16
| * | | | | | | | | i18n: i18n: diff: mark die messages for translationJean-Noël AVILA2016-09-211-5/+10
| * | | | | | | | | i18n: connect: mark die messages for translationVasco Almeida2016-09-192-5/+5
| * | | | | | | | | i18n: commit: mark message for translationVasco Almeida2016-09-193-9/+9
* | | | | | | | | | Merge branch 'jt/format-patch-rfc'Junio C Hamano2016-09-263-2/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH]jt/format-patch-rfcJosh Triplett2016-09-213-2/+25
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ep/doc-check-ref-format-example'Junio C Hamano2016-09-261-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-check-ref-format.txt: fixup documentationep/doc-check-ref-format-exampleElia Pinto2016-09-211-2/+2
* | | | | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-2614-115/+828
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-198-19/+70
| * | | | | | | | | | | parse-options: add parse_opt_unknown_cb()Michael Haggerty2016-09-192-0/+13
| * | | | | | | | | | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-197-11/+546
| * | | | | | | | | | | xdl_change_compact(): introduce the concept of a change groupMichael Haggerty2016-08-231-90/+203
| * | | | | | | | | | | recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty2016-08-231-7/+7