summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* gitweb: fix a typo in a commentÆvar Arnfjörð Bjarmason2016-10-141-1/+1
* Git 2.10.1v2.10.1Junio C Hamano2016-10-033-2/+14
* Merge branch 'jk/ident-ai-canonname-could-be-null' into maintJunio C Hamano2016-10-031-1/+1
|\
| * ident: handle NULL ai_canonnameJeff King2016-09-231-1/+1
* | Merge branch 'jk/doc-cvs-update' into maintJunio C Hamano2016-10-032-2/+6
|\ \
| * | docs/cvs-migration: mention cvsimport caveatsJeff 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 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-032-30/+95
|\ \
| * | pack-objects: walk tag chains for --include-tagJeff King2016-09-072-1/+82
| * | t5305: simplify packname handlingJeff King2016-09-071-6/+6
| * | t5305: use "git -C"Jeff King2016-09-071-21/+7
| * | t5305: drop "dry-run" of unpack-objectsJeff King2016-09-071-2/+0
| * | t5305: move cleanup into test blockJeff King2016-09-071-2/+2
* | | Prepare for 2.10.1Junio C Hamano2016-09-301-0/+87
* | | Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-308-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-152-1/+14
| * | | Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fixJunio C Hamano2016-09-151-39/+26
| |\ \ \
* | | | | Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-09-301-1/+6
|\| | | |
| * | | | add: document the chmod optionThomas Gummerer2016-09-131-1/+6
* | | | | Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-302-4/+4
|\ \ \ \ \
| * | | | | rebase -i: improve advice on bad instruction linesRalf Thielow2016-09-072-4/+4
* | | | | | Merge branch 'ls/travis-homebrew-path-fix' into maintJunio C Hamano2016-09-301-1/+1
|\ \ \ \ \ \
| * | | | | | travis-ci: ask homebrew for its path instead of hardcoding itLars Schneider2016-09-221-1/+1
* | | | | | | Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-307-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' into maintJunio C Hamano2016-09-304-3/+36
|\ \ \ \ \ \ \
| * | | | | | | checkout: fix ambiguity check in subdirNguyễ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 'ep/doc-check-ref-format-example' into maintJunio C Hamano2016-09-301-2/+2
|\ \ \ \ \ \ \
| * | | | | | | git-check-ref-format.txt: fixup documentationElia Pinto2016-09-211-2/+2
* | | | | | | | Merge branch 'mm/config-color-ui-default-to-auto' into maintJunio C Hamano2016-09-301-6/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/config: default for color.* is color.uiMatthieu Moy2016-09-161-6/+12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-302-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | gc: default aggressive depth to 50Jeff King2016-08-112-2/+2
* | | | | | | | | Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-302-3/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase-interactive: drop early check for valid identJeff King2016-07-302-3/+47
* | | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-302-9/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: show base info before email signatureJosh Triplett2016-09-152-9/+30
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano2016-09-301-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/perf/run: copy config.mak.autogen & friends to build areaKirill Smelkov2016-09-151-1/+7
* | | | | | | | | | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-302-1/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | xdiff: fix merging of hunks with -W context and -u contextRené Scharfe2016-09-152-1/+26