Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mp/t7060-diff-index-test' | Junio C Hamano | 2015-09-14 | 1 | -1/+1 |
|\ | |||||
| * | t7060: actually test "git diff-index --cached -M"mp/t7060-diff-index-test | Matthieu Prat | 2015-09-02 | 1 | -1/+1 |
* | | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 | 1 | -0/+48 |
|\ \ | |||||
| * | | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fix | Junio C Hamano | 2015-09-06 | 1 | -0/+48 |
* | | | Merge branch 'jk/am-rerere-lock-fix' | Junio C Hamano | 2015-09-03 | 1 | -0/+36 |
|\ \ \ | |||||
| * | | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fix | Jeff King | 2015-09-01 | 1 | -0/+36 |
* | | | | Merge branch 'cc/trailers-corner-case-fix' | Junio C Hamano | 2015-09-02 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | trailer: support multiline titlecc/trailers-corner-case-fix | Christian Couder | 2015-08-31 | 1 | -0/+14 |
* | | | | | Merge branch 'ee/clean-test-fixes' | Junio C Hamano | 2015-09-02 | 1 | -12/+4 |
|\ \ \ \ \ | |||||
| * | | | | | t7300: fix broken && chainsee/clean-test-fixes | Erik Elfström | 2015-08-31 | 1 | -12/+4 |
* | | | | | | Merge branch 'jk/log-missing-default-HEAD' | Junio C Hamano | 2015-09-02 | 1 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEAD | Jeff King | 2015-08-31 | 1 | -0/+14 |
* | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-01 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-update | David Turner | 2015-08-31 | 1 | -0/+10 |
| * | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maint | Junio C Hamano | 2015-08-25 | 1 | -0/+106 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/test-with-x' into maint | Junio C Hamano | 2015-08-25 | 1 | -2/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/export-worktree' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 1 | -39/+60 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/sparse-checkout-removal' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+52 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/archive-zip-many' | Junio C Hamano | 2015-09-01 | 1 | -0/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | archive-zip: support more than 65535 entriesrs/archive-zip-many | René Scharfe | 2015-08-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | t5004: test ZIP archives with many entries | René Scharfe | 2015-08-28 | 1 | -0/+40 |
| * | | | | | | | | | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint | Junio C Hamano | 2015-08-03 | 1 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/am-abort-fix' into maint | Junio C Hamano | 2015-08-03 | 1 | -0/+81 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 | 1 | -0/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/commit-cleanup-scissors' into maint | Junio C Hamano | 2015-08-03 | 1 | -1/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-fold-case-client-specs' | Junio C Hamano | 2015-09-01 | 1 | -0/+200 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specs | Lars Schneider | 2015-08-28 | 1 | -0/+200 |
* | | | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains' | Junio C Hamano | 2015-08-31 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-contains | SZEDER Gábor | 2015-08-25 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 | 2 | -0/+91 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-config | Jacob Keller | 2015-08-17 | 1 | -0/+39 |
| * | | | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 | 1 | -0/+40 |
| * | | | | | | | | | | | | | | | | | | | notes: add tests for --commit/--abort/--strategy exclusivity | Jacob Keller | 2015-08-17 | 1 | -0/+12 |
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings' | Junio C Hamano | 2015-08-31 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warnings | Jeff King | 2015-08-24 | 1 | -0/+9 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 | 1 | -0/+153 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-config | Heiko Voigt | 2015-08-19 | 1 | -0/+35 |
| * | | | | | | | | | | | | | | | | | | | | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 | 1 | -2/+35 |
| * | | | | | | | | | | | | | | | | | | | | submodule: implement a config API for lookup of .gitmodules values | Heiko Voigt | 2015-08-19 | 1 | -0/+85 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-08-31 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 | 1 | -0/+22 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/trailers-corner-case-fix' | Junio C Hamano | 2015-08-28 | 1 | -1/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | trailer: retitle a test and correct an in-comment message | Christian Couder | 2015-08-26 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | trailer: ignore first line of message | Christian Couder | 2015-08-21 | 1 | -1/+14 |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'dt/untracked-subdir' | Junio C Hamano | 2015-08-28 | 1 | -2/+98 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | untracked cache: fix entry invalidationdt/untracked-subdir | Nguyễn Thái Ngọc Duy | 2015-08-19 | 1 | -1/+27 |
| * | | | | | | | | | | | | | | | | | | | untracked-cache: fix subdirectory handling | David Turner | 2015-08-19 | 1 | -1/+71 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/t3020-typofix' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | t3020: fix typo in test descriptionsg/t3020-typofix | SZEDER Gábor | 2015-08-20 | 1 | -1/+1 |