Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'ld/p4-import-labels' | Junio C Hamano | 2015-10-05 |
|\ | |||
| * | git-p4: fix P4 label import for unprocessed commits | Luke Diamand | 2015-08-28 |
| * | git-p4: failing test for ignoring invalid p4 labels | Luke Diamand | 2015-08-28 |
* | | Merge branch 'ad/bisect-terms' | Junio C Hamano | 2015-10-05 |
|\ \ | |||
| * | | bisect: allow setting any user-specified in 'git bisect start' | Matthieu Moy | 2015-08-03 |
| * | | bisect: add 'git bisect terms' to view the current terms | Matthieu Moy | 2015-08-03 |
| * | | bisect: add the terms old/new | Antoine Delaite | 2015-08-03 |
* | | | Merge branch 'kn/for-each-tag-branch' | Junio C Hamano | 2015-10-05 |
|\ \ \ | |||
| * | | | for-each-ref: add '--contains' option | Karthik Nayak | 2015-08-03 |
| * | | | for-each-ref: add '--merged' and '--no-merged' options | Karthik Nayak | 2015-08-03 |
| * | | | for-each-ref: add '--points-at' option | Karthik Nayak | 2015-08-03 |
| * | | | t6302: for-each-ref tests for ref-filter APIs | Karthik Nayak | 2015-08-03 |
* | | | | Merge branch 'mp/t7060-diff-index-test' | Junio C Hamano | 2015-09-14 |
|\ \ \ \ | |||
| * | | | | t7060: actually test "git diff-index --cached -M" | Matthieu Prat | 2015-09-02 |
* | | | | | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 |
|\ \ \ \ \ | |||
| * | | | | | am: match --signoff to the original scripted version | Junio C Hamano | 2015-09-06 |
* | | | | | | Merge branch 'jk/am-rerere-lock-fix' | Junio C Hamano | 2015-09-03 |
|\ \ \ \ \ \ | |||
| * | | | | | | rerere: release lockfile in non-writing functions | Jeff King | 2015-09-01 |
* | | | | | | | Merge branch 'cc/trailers-corner-case-fix' | Junio C Hamano | 2015-09-02 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | trailer: support multiline title | Christian Couder | 2015-08-31 |
* | | | | | | | | Merge branch 'ee/clean-test-fixes' | Junio C Hamano | 2015-09-02 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t7300: fix broken && chains | Erik Elfström | 2015-08-31 |
* | | | | | | | | | Merge branch 'jk/log-missing-default-HEAD' | Junio C Hamano | 2015-09-02 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | log: diagnose empty HEAD more clearly | Jeff King | 2015-08-31 |
* | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-01 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | commit: don't rewrite shared index unnecessarily | David Turner | 2015-08-31 |
| * | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maint | Junio C Hamano | 2015-08-25 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-with-x' into maint | Junio C Hamano | 2015-08-25 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/export-worktree' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/sparse-checkout-removal' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/archive-zip-many' | Junio C Hamano | 2015-09-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | archive-zip: support more than 65535 entries | René Scharfe | 2015-08-28 |
| * | | | | | | | | | | | | | | | | t5004: test ZIP archives with many entries | René Scharfe | 2015-08-28 |
| * | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint | Junio C Hamano | 2015-08-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/am-abort-fix' into maint | Junio C Hamano | 2015-08-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/commit-cleanup-scissors' into maint | Junio C Hamano | 2015-08-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-fold-case-client-specs' | Junio C Hamano | 2015-09-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | | git-p4: honor core.ignorecase when using P4 client specs | Lars Schneider | 2015-08-28 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is given | SZEDER Gábor | 2015-08-25 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller | 2015-08-17 |
| * | | | | | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 |
| * | | | | | | | | | | | | | | | | | | | | | notes: add tests for --commit/--abort/--strategy exclusivity | Jacob Keller | 2015-08-17 |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | config: silence warnings for command names with invalid keys | Jeff King | 2015-08-24 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules option | Heiko Voigt | 2015-08-19 |