Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with maint for Russian translation | Junio C Hamano | 2015-10-18 | 1 | -1583/+1967 |
|\ | |||||
| * | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2015-10-18 | 1 | -1583/+1967 |
| |\ | |||||
| | * | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2015-09-30 | 1 | -1583/+1967 |
* | | | Sync with 2.6.2 | Junio C Hamano | 2015-10-16 | 3 | -2/+68 |
|\ \ \ | |/ / | |||||
| * | | Git 2.6.2v2.6.2 | Junio C Hamano | 2015-10-16 | 4 | -3/+69 |
| * | | Merge branch 'cc/quote-comments' into maint | Junio C Hamano | 2015-10-16 | 1 | -5/+6 |
| |\ \ | |||||
| * \ \ | Merge branch 'es/worktree-add-cleanup' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'tk/doc-interpret-trailers-grammo' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'tk/typofix-connect-unknown-proto-error' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint | Junio C Hamano | 2015-10-16 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'nd/ls-remote-does-not-have-u-option' into maint | Junio C Hamano | 2015-10-16 | 2 | -3/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/fsck-dropped-errors' into maint | Junio C Hamano | 2015-10-16 | 2 | -5/+35 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/http-flaky-test-fix' into maint | Junio C Hamano | 2015-10-16 | 3 | -23/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sb/perf-without-installed-git' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/icase-wt-detection' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/am-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/detach-at-HEAD-reflog' into maint | Junio C Hamano | 2015-10-16 | 2 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-10-16 | 2 | -35/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/log-follow-config' into maint | Junio C Hamano | 2015-10-16 | 2 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maint | Junio C Hamano | 2015-10-16 | 3 | -14/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/notes-dwim-doc' into maint | Junio C Hamano | 2015-10-16 | 3 | -3/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/make-findstring-makeflags-fix' into maint | Junio C Hamano | 2015-10-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jw/make-arflags-customizable' into maint | Junio C Hamano | 2015-10-16 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/connect-clear-env' into maint | Junio C Hamano | 2015-10-16 | 2 | -10/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 | 2 | -1/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/keyid-docs' into maint | Junio C Hamano | 2015-10-16 | 10 | -29/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-builtin' into maint | Junio C Hamano | 2015-10-16 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | pull: enclose <options> in brackets in the usage stringpt/pull-builtin | Alex Henrie | 2015-10-16 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Fifth batch for 2.7 | Junio C Hamano | 2015-10-16 | 1 | -1/+17 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-gc-prune-now' | Junio C Hamano | 2015-10-16 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/gc: warn against --prune=<now>jc/doc-gc-prune-now | Junio C Hamano | 2015-10-14 | 1 | -2/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-config-parse' | Junio C Hamano | 2015-10-16 | 1 | -45/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | submodule-config: "goto" removal in parse_config()sb/submodule-config-parse | Stefan Beller | 2015-10-12 | 1 | -45/+29 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' | Junio C Hamano | 2015-10-16 | 2 | -1/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: remove multi-line headers in msg filterjk/filter-branch-use-of-sed-on-incomplete-line | James McCoy | 2015-10-12 | 2 | -1/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd/test-path-utils' | Junio C Hamano | 2015-10-16 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | test-path-utils.c: remove incorrect assumptionrd/test-path-utils | Ray Donnelly | 2015-10-08 | 2 | -2/+5 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for 2.7 | Junio C Hamano | 2015-10-15 | 1 | -0/+78 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2015-10-15 | 4 | -16/+766 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add Git LFS backend for large file system | Lars Schneider | 2015-10-03 | 2 | -0/+360 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add support for large file systems | Lars Schneider | 2015-10-03 | 3 | -10/+353 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: check free space during streaming | Lars Schneider | 2015-10-03 | 1 | -0/+18 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add file streaming progress in verbose mode | Lars Schneider | 2015-10-03 | 1 | -2/+18 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: return an empty list if a list config has no values | Lars Schneider | 2015-10-03 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add gitConfigInt reader | Lars Schneider | 2015-10-03 | 1 | -0/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add optional type specifier to gitConfig reader | Lars Schneider | 2015-10-03 | 1 | -6/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/gc-with-stale-symref' | Junio C Hamano | 2015-10-15 | 2 | -1/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symref | Johannes Schindelin | 2015-10-08 | 2 | -2/+8 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | gc: demonstrate failure with stale remote HEAD | Johannes Schindelin | 2015-10-05 | 1 | -0/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/clone-dissociate' | Junio C Hamano | 2015-10-15 | 4 | -23/+62 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |