summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-07-101-0/+26
|\
| * Add tests for wildcard "path vs ref" disambiguationNguyễn Thái Ngọc Duy2015-07-011-0/+26
* | Merge branch 'jk/maint-for-each-packed-object'Junio C Hamano2015-07-091-0/+1
|\ \
| * | for_each_packed_object: automatically open pack indexJeff King2015-06-221-0/+1
| * | Sync with 2.3.8Junio C Hamano2015-05-112-4/+38
| |\ \ | | |/ | |/|
* | | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-252-25/+8
|\ \ \
| * | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"Junio C Hamano2015-06-232-25/+8
* | | | Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-06-241-7/+0
|\ \ \ \
| * | | | Revert "stash: require a clean index to apply"Jeff King2015-06-151-7/+0
* | | | | Merge branch 'pt/t0302-needs-sanity'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \
| * | | | | t0302: "unreadable" test needs SANITY prereqPaul Tan2015-06-121-1/+1
* | | | | | Merge branch 'ld/p4-changes-block-size'Junio C Hamano2015-06-242-9/+102
|\ \ \ \ \ \
| * | | | | | git-p4: fixing --changes-block-size handlingLuke Diamand2015-06-101-6/+6
| * | | | | | git-p4: add tests for non-numeric revision rangeLuke Diamand2015-06-101-0/+38
| * | | | | | git-p4: test with limited p4 server resultsLuke Diamand2015-06-081-6/+23
| * | | | | | git-p4: additional testing of --changes-block-sizeLuke Diamand2015-06-081-9/+47
* | | | | | | Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano2015-06-241-1/+23
|\ \ \ \ \ \ \
| * | | | | | | commit: cope with scissors lines in commit messageSZEDER Gábor2015-06-091-1/+23
* | | | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano2015-06-241-0/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | read_loose_refs(): treat NULL_SHA1 loose references as brokenMichael Haggerty2015-06-081-1/+1
| * | | | | | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-021-1/+1
| * | | | | | | | t6301: new tests of for-each-ref error handlingMichael Haggerty2015-06-021-0/+56
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'pt/am-abort-fix'Junio C Hamano2015-06-241-0/+81
|\ \ \ \ \ \ \ \
| * | | | | | | | am --abort: keep unrelated commits on unborn branchPaul Tan2015-06-081-0/+11
| * | | | | | | | am --abort: support aborting to unborn branchPaul Tan2015-06-081-0/+17
| * | | | | | | | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-081-0/+23
| * | | | | | | | am --skip: support skipping while on unborn branchPaul Tan2015-06-081-0/+10
| * | | | | | | | am -3: support 3way merge on unborn branchPaul Tan2015-06-081-0/+9
| * | | | | | | | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-081-0/+11
* | | | | | | | | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-241-15/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-am: add am.threeWay config variableRemi Lespinet2015-06-041-0/+19
| * | | | | | | | | t4150-am: refactor am -3 testsRemi Lespinet2015-06-041-15/+11
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-241-5/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ll-merge: pass the original path to external driversJunio C Hamano2015-06-051-5/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pt/pull-optparse'Junio C Hamano2015-06-242-0/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: handle git-fetch's options as wellPaul Tan2015-06-022-0/+34
| * | | | | | | | | Merge branch 'pt/pull-tests' into pt/pull-optparseJunio C Hamano2015-06-022-36/+175
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'qn/blame-show-email'Junio C Hamano2015-06-241-0/+62
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: add blame.showEmail configurationQuentin Neill2015-06-021-0/+62
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano2015-06-241-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | format-patch: do not feed tags to clear_commit_marks()Junio C Hamano2015-06-021-0/+8
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'es/send-email-sendmail-alias'Junio C Hamano2015-06-241-18/+63
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t9001: add sendmail aliases line continuation testsEric Sunshine2015-06-021-0/+34
| * | | | | | | | | | | t9001: refactor sendmail aliases test infrastructureEric Sunshine2015-06-021-18/+29
* | | | | | | | | | | | Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano2015-06-241-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply: reject a hunk that does not do anythingJunio C Hamano2015-06-011-0/+13
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/die-on-bogus-worktree-late'Junio C Hamano2015-06-161-8/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | setup_git_directory: delay core.bare/core.worktree errorsJeff King2015-05-291-8/+16
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ah/send-email-sendmail-alias'Junio C Hamano2015-06-161-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | t9001: write $HOME/, not ~/, to help shells without tilde expansionJunio C Hamano2015-05-271-1/+1