Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bw/push-dry-run' | Junio C Hamano | 2016-12-16 | 4 | -9/+41 |
|\ | |||||
| * | push: fix --dry-run to not push submodulesbw/push-dry-run | Brandon Williams | 2016-11-23 | 4 | -10/+18 |
| * | push: --dry-run updates submodules when --recurse-submodules=on-demand | Brandon Williams | 2016-11-23 | 1 | -0/+24 |
* | | Merge branch 'hv/submodule-not-yet-pushed-fix' | Junio C Hamano | 2016-12-16 | 3 | -36/+121 |
|\ \ | |/ | |||||
| * | submodule_needs_pushing(): explain the behaviour when we cannot answerhv/submodule-not-yet-pushed-fix | Heiko Voigt | 2016-11-16 | 1 | -0/+11 |
| * | batch check whether submodule needs pushing into one call | Heiko Voigt | 2016-11-16 | 1 | -29/+33 |
| * | serialize collection of refs that contain submodule changes | Heiko Voigt | 2016-11-16 | 3 | -25/+44 |
| * | serialize collection of changed submodules | Heiko Voigt | 2016-11-16 | 1 | -4/+55 |
* | | Merge branch 'dt/empty-submodule-in-merge' | Junio C Hamano | 2016-12-16 | 3 | -11/+17 |
|\ \ | |||||
| * | | submodules: allow empty working-tree dirs in merge/cherry-pickdt/empty-submodule-in-merge | David Turner | 2016-11-17 | 3 | -11/+17 |
* | | | Merge branch 'jk/rev-parse-symbolic-parents-fix' | Junio C Hamano | 2016-12-16 | 2 | -1/+24 |
|\ \ \ | |||||
| * | | | rev-parse: fix parent shorthands with --symbolicjk/rev-parse-symbolic-parents-fix | Jeff King | 2016-11-16 | 2 | -1/+24 |
* | | | | Early fixes for 2.11.x series | Junio C Hamano | 2016-12-13 | 1 | -0/+10 |
* | | | | Merge branch 'ew/svn-fixes' | Junio C Hamano | 2016-12-13 | 2 | -2/+8 |
|\ \ \ \ | |||||
| * | | | | git-svn: document useLogAuthor and addAuthorFrom config keysew/svn-fixes | Eric Wong | 2016-12-12 | 1 | -1/+7 |
| * | | | | git-svn: allow "0" in SVN path components | Eric Wong | 2016-12-12 | 1 | -1/+1 |
* | | | | | Merge branch 'js/mingw-isatty' | Junio C Hamano | 2016-12-13 | 2 | -0/+36 |
|\ \ \ \ \ | |||||
| * | | | | | mingw: intercept isatty() to handle /dev/null as Git expects it | Johannes Schindelin | 2016-12-11 | 2 | -0/+36 |
* | | | | | | Start post 2.11 cycle | Junio C Hamano | 2016-12-05 | 3 | -2/+45 |
| |/ / / / |/| | | | | |||||
* | | | | | Sync with maint-2.10 | Junio C Hamano | 2016-12-05 | 1 | -0/+48 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | preparing for 2.10.3 | Junio C Hamano | 2016-12-05 | 2 | -1/+49 |
| * | | | | Merge branch 'jk/common-main' into maint-2.10 | Junio C Hamano | 2016-12-05 | 5 | -11/+12 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'tk/diffcore-delta-remove-unused' into maint | Junio C Hamano | 2016-11-29 | 5 | -8/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/create-branch-remove-unused-param' into maint | Junio C Hamano | 2016-11-29 | 4 | -13/+18 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'nd/worktree-lock' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ps/common-info-doc' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-11-29 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-11-29 | 2 | -3/+18 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint | Junio C Hamano | 2016-11-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/commit-pptr-simplify' into maint | Junio C Hamano | 2016-11-29 | 1 | -8/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/pre-receive-hook-template-modefix' into maint | Junio C Hamano | 2016-11-29 | 1 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/macos-update' into maint | Junio C Hamano | 2016-11-29 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/merge-attr-sleep' into maint | Junio C Hamano | 2016-11-29 | 1 | -5/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maint | Junio C Hamano | 2016-11-29 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/daemon-path-ok-check-truncation' into maint | Junio C Hamano | 2016-11-29 | 1 | -4/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/ring-buffer-wraparound' into maint | Junio C Hamano | 2016-11-29 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/send-email-cc-cruft-after-address' into maint | Junio C Hamano | 2016-11-29 | 3 | -10/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cp/completion-negative-refs' into maint | Junio C Hamano | 2016-11-29 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/am-read-author-file' into maint | Junio C Hamano | 2016-11-29 | 1 | -58/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | Git 2.11v2.11.0 | Junio C Hamano | 2016-11-29 | 2 | -1/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/common-main' | Junio C Hamano | 2016-11-29 | 4 | -9/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | common-main: stop munging argv[0] pathjk/common-main | Jeff King | 2016-11-29 | 4 | -9/+10 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po | Junio C Hamano | 2016-11-29 | 2 | -4189/+5888 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru | Jiang Xin | 2016-11-29 | 1 | -2066/+2868 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2016-11-29 | 1 | -2066/+2868 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | l10n: ca.po: update translation | Alex Henrie | 2016-11-28 | 1 | -2123/+3020 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | RelNotes: spelling and phrasing fixups | Marc Branchaud | 2016-11-28 | 1 | -76/+72 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-po | Junio C Hamano | 2016-11-28 | 8 | -2193/+3167 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 210 new messages | Ralf Thielow | 2016-11-28 | 1 | -2111/+3085 |