aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'ld/p4-import-labels'Junio C Hamano2015-10-05
|\
| * git-p4: fix P4 label import for unprocessed commitsLuke Diamand2015-08-28
| * git-p4: failing test for ignoring invalid p4 labelsLuke Diamand2015-08-28
* | Merge branch 'ad/bisect-terms'Junio C Hamano2015-10-05
|\ \
| * | bisect: allow setting any user-specified in 'git bisect start'Matthieu Moy2015-08-03
| * | bisect: add 'git bisect terms' to view the current termsMatthieu Moy2015-08-03
| * | bisect: add the terms old/newAntoine Delaite2015-08-03
* | | Merge branch 'kn/for-each-tag-branch'Junio C Hamano2015-10-05
|\ \ \
| * | | for-each-ref: add '--contains' optionKarthik Nayak2015-08-03
| * | | for-each-ref: add '--merged' and '--no-merged' optionsKarthik Nayak2015-08-03
| * | | for-each-ref: add '--points-at' optionKarthik Nayak2015-08-03
| * | | t6302: for-each-ref tests for ref-filter APIsKarthik Nayak2015-08-03
* | | | Merge branch 'mp/t7060-diff-index-test'Junio C Hamano2015-09-14
|\ \ \ \
| * | | | t7060: actually test "git diff-index --cached -M"Matthieu Prat2015-09-02
* | | | | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-08
|\ \ \ \ \
| * | | | | am: match --signoff to the original scripted versionJunio C Hamano2015-09-06
* | | | | | Merge branch 'jk/am-rerere-lock-fix'Junio C Hamano2015-09-03
|\ \ \ \ \ \
| * | | | | | rerere: release lockfile in non-writing functionsJeff King2015-09-01
* | | | | | | Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-09-02
|\ \ \ \ \ \ \
| * | | | | | | trailer: support multiline titleChristian Couder2015-08-31
* | | | | | | | Merge branch 'ee/clean-test-fixes'Junio C Hamano2015-09-02
|\ \ \ \ \ \ \ \
| * | | | | | | | t7300: fix broken && chainsErik Elfström2015-08-31
* | | | | | | | | Merge branch 'jk/log-missing-default-HEAD'Junio C Hamano2015-09-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log: diagnose empty HEAD more clearlyJeff King2015-08-31
* | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: don't rewrite shared index unnecessarilyDavid Turner2015-08-31
| * | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-with-x' into maintJunio C Hamano2015-08-25
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/export-worktree' into maintJunio C Hamano2015-08-19
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2015-08-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/archive-zip-many'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | archive-zip: support more than 65535 entriesRené Scharfe2015-08-28
| * | | | | | | | | | | | | | | | t5004: test ZIP archives with many entriesRené Scharfe2015-08-28
| * | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-fold-case-client-specs'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | git-p4: honor core.ignorecase when using P4 client specsLars Schneider2015-08-28
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givenSZEDER Gábor2015-08-25
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller2015-08-17
| * | | | | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-17
| * | | | | | | | | | | | | | | | | | | | | notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller2015-08-17
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | config: silence warnings for command names with invalid keysJeff King2015-08-24
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules optionHeiko Voigt2015-08-19