summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync with maint for Russian translationJunio C Hamano2015-10-181-1583/+1967
|\
| * Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2015-10-181-1583/+1967
| |\
| | * l10n: ru.po: update Russian translationDimitriy Ryazantcev2015-09-301-1583/+1967
* | | Sync with 2.6.2Junio C Hamano2015-10-163-2/+68
|\ \ \ | |/ /
| * | Git 2.6.2v2.6.2Junio C Hamano2015-10-164-3/+69
| * | Merge branch 'cc/quote-comments' into maintJunio C Hamano2015-10-161-5/+6
| |\ \
| * \ \ Merge branch 'es/worktree-add-cleanup' into maintJunio C Hamano2015-10-161-0/+0
| |\ \ \
| * \ \ \ Merge branch 'tk/doc-interpret-trailers-grammo' into maintJunio C Hamano2015-10-161-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'tk/typofix-connect-unknown-proto-error' into maintJunio C Hamano2015-10-161-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maintJunio C Hamano2015-10-162-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/ls-remote-does-not-have-u-option' into maintJunio C Hamano2015-10-162-3/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-162-5/+35
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/http-flaky-test-fix' into maintJunio C Hamano2015-10-163-23/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/perf-without-installed-git' into maintJunio C Hamano2015-10-161-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/icase-wt-detection' into maintJunio C Hamano2015-10-161-1/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/am-builtin' into maintJunio C Hamano2015-10-161-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano2015-10-162-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-10-162-35/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/log-follow-config' into maintJunio C Hamano2015-10-162-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maintJunio C Hamano2015-10-163-14/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/notes-dwim-doc' into maintJunio C Hamano2015-10-163-3/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/make-findstring-makeflags-fix' into maintJunio C Hamano2015-10-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jw/make-arflags-customizable' into maintJunio C Hamano2015-10-161-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/connect-clear-env' into maintJunio C Hamano2015-10-162-10/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-162-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/keyid-docs' into maintJunio C Hamano2015-10-1610-29/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-163-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | pull: enclose <options> in brackets in the usage stringpt/pull-builtinAlex Henrie2015-10-161-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Fifth batch for 2.7Junio C Hamano2015-10-161-1/+17
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-gc-prune-now'Junio C Hamano2015-10-161-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Documentation/gc: warn against --prune=<now>jc/doc-gc-prune-nowJunio C Hamano2015-10-141-2/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-config-parse'Junio C Hamano2015-10-161-45/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | submodule-config: "goto" removal in parse_config()sb/submodule-config-parseStefan Beller2015-10-121-45/+29
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line'Junio C Hamano2015-10-162-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: remove multi-line headers in msg filterjk/filter-branch-use-of-sed-on-incomplete-lineJames McCoy2015-10-122-1/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd/test-path-utils'Junio C Hamano2015-10-162-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-path-utils.c: remove incorrect assumptionrd/test-path-utilsRay Donnelly2015-10-082-2/+5
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for 2.7Junio C Hamano2015-10-151-0/+78
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-154-16/+766
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add Git LFS backend for large file systemLars Schneider2015-10-032-0/+360
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add support for large file systemsLars Schneider2015-10-033-10/+353
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: check free space during streamingLars Schneider2015-10-031-0/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add file streaming progress in verbose modeLars Schneider2015-10-031-2/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: return an empty list if a list config has no valuesLars Schneider2015-10-031-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add gitConfigInt readerLars Schneider2015-10-031-0/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add optional type specifier to gitConfig readerLars Schneider2015-10-031-6/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/gc-with-stale-symref'Junio C Hamano2015-10-152-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symrefJohannes Schindelin2015-10-082-2/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | gc: demonstrate failure with stale remote HEADJohannes Schindelin2015-10-051-0/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/clone-dissociate'Junio C Hamano2015-10-154-23/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \