summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-101-0/+70
|\
| * branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto2012-08-301-0/+34
| * branch: add --unset-upstream optionCarlos Martín Nieto2012-08-301-0/+22
| * branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-231-0/+14
* | Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-102-0/+25
|\ \
| * | cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-301-1/+1
| * | demonstrate broken 'git cherry-pick three one two'Martin von Zweigbergk2012-08-301-0/+15
| * | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-301-0/+10
* | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'Junio C Hamano2012-09-101-0/+12
|\ \ \
| * | | log: fix --quiet synonym for -sJeff King2012-08-281-0/+12
| * | | Merge branch 'mk/test-seq' into maint-1.7.11Junio C Hamano2012-08-243-2/+23
| |\ \ \
* | \ \ \ Merge branch 'jk/maint-http-half-auth-push'Junio C Hamano2012-09-076-75/+127
|\ \ \ \ \
| * | | | | http: prompt for credentials on failed POSTJeff King2012-08-271-1/+1
| * | | | | t: test http access to "half-auth" repositoriesJeff King2012-08-273-0/+28
| * | | | | t: test basic smart-http authenticationJeff King2012-08-272-0/+25
| * | | | | t/lib-httpd: recognize */smart/* repos as smart-httpJeff King2012-08-271-9/+7
| * | | | | t/lib-httpd: only route auth/dumb to dumb reposJeff King2012-08-271-1/+1
| * | | | | t5550: factor out http auth setupJeff King2012-08-273-54/+55
| * | | | | t5550: put auth-required repo in auth/dumbJeff King2012-08-271-9/+9
* | | | | | Merge branch 'jc/apply-binary-p0'Junio C Hamano2012-09-071-21/+33
|\ \ \ \ \ \
| * | | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-241-21/+33
* | | | | | | Merge branch 'jc/dotdot-is-parent-directory'Junio C Hamano2012-09-072-0/+21
|\ \ \ \ \ \ \
| * | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-232-0/+21
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'rj/maint-grep-remove-redundant-test' into maintJunio C Hamano2012-08-151-11/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'kk/maint-for-each-ref-multi-sort'Junio C Hamano2012-09-071-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | for-each-ref: Fix sort with multiple keysKacper Kornet2012-08-211-1/+1
| * | | | | | | | t6300: test sort with multiple keysKacper Kornet2012-08-211-0/+10
* | | | | | | | | Merge branch 'pw/p4-use-client-spec-branch-detection'Junio C Hamano2012-09-073-17/+94
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git p4: make branch detection work with --use-client-specPete Wyckoff2012-08-201-1/+1
| * | | | | | | | | git p4 test: add broken --use-client-spec --detect-branches testsPete Wyckoff2012-08-111-0/+77
| * | | | | | | | | git p4 test: move client_view() function to libraryPete Wyckoff2012-08-112-17/+17
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/i18n-poison-test-updates'Junio C Hamano2012-09-0723-53/+83
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix tests under GETTEXT_POISON on parseoptJiang Xin2012-08-2711-22/+46
| * | | | | | | | | Fix tests under GETTEXT_POISON on git-remoteJiang Xin2012-08-271-11/+17
| * | | | | | | | | Fix tests under GETTEXT_POISON on pack-objectJiang Xin2012-08-272-4/+4
| * | | | | | | | | Fix tests under GETTEXT_POISON on git-applyJiang Xin2012-08-273-6/+6
| * | | | | | | | | Fix tests under GETTEXT_POISON on diffstatJiang Xin2012-08-274-8/+8
| * | | | | | | | | Fix tests under GETTEXT_POISON on git-stashJiang Xin2012-08-271-1/+1
| * | | | | | | | | Fix tests under GETTEXT_POISON on relative datesJiang Xin2012-08-271-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sz/submodule-force-update'Junio C Hamano2012-09-031-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-241-0/+12
* | | | | | | | | | Merge branch 'ph/stash-rerere'Junio C Hamano2012-09-031-0/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: invoke rerere in case of conflictPhil Hord2012-08-171-1/+1
| * | | | | | | | | | test: git-stash conflict sets up rererePhil Hord2012-08-171-0/+38
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cw/cherry-pick-allow-empty-message'Junio C Hamano2012-09-031-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cherry-pick: add --allow-empty-message optionChris Webb2012-08-061-0/+5
* | | | | | | | | | | Merge branch 'ef/win32-cred-helper'Junio C Hamano2012-08-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib: add win32 credential-helperErik Faye-Lund2012-08-161-0/+4
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'hv/submodule-path-unmatch'Junio C Hamano2012-08-291-4/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Let submodule command exit with error status if path does not existHeiko Voigt2012-08-141-4/+22
| | |_|_|_|/ / / / / / | |/| | | | | | | | |