summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-301-2/+30
* Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano2014-05-201-8/+23
* Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano2014-05-191-23/+8
|\
| * Revert "Merge branch 'fc/transport-helper-sync-error-fix'"Junio C Hamano2014-05-191-23/+8
* | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-191-3/+3
|\ \
| * | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-191-3/+3
* | | Merge branch 'lt/request-pull'Junio C Hamano2014-05-191-1/+7
|\ \ \ | |_|/ |/| |
| * | request-pull: resurrect for-linus -> tags/for-linus DWIMJunio C Hamano2014-05-161-1/+7
* | | Merge branch 'km/git-svn-workaround-older-getopt-long'Junio C Hamano2014-05-021-4/+4
|\ \ \
| * | | t9117: use --prefix "" instead of --prefix=""km/git-svn-workaround-older-getopt-longKyle J. McKay2014-04-231-4/+4
* | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-021-22/+22
|\ \ \ \ | | |_|/ | |/| |
| * | | git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-221-22/+22
* | | | Merge branch 'fc/transport-helper-sync-error-fix'Junio C Hamano2014-04-241-8/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | t5801 (remote-helpers): cleanup environment setsfc/transport-helper-sync-error-fixFelipe Contreras2014-04-211-7/+4
| * | | transport-helper: fix sync issue on crashesFelipe Contreras2014-04-141-1/+19
* | | | Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not givenJohan Herland2014-04-1918-126/+126
* | | | Merge branch 'km/avoid-cp-a'Junio C Hamano2014-04-161-2/+2
|\ \ \ \
| * | | | test: fix t7001 cp to use POSIX optionskm/avoid-cp-aKyle J. McKay2014-04-111-2/+2
| | |/ / | |/| |
* | | | Merge branch 'km/avoid-bs-in-shell-glob'Junio C Hamano2014-04-161-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | test: fix t5560 on FreeBSDkm/avoid-bs-in-shell-globKyle J. McKay2014-04-111-2/+2
| |/ /
* | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-081-0/+31
|\ \ \
| * | | add `ignore_missing_links` mode to revwalkVicent Marti2014-04-041-0/+31
* | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-087-7/+7
|\ \ \ \
| * | | | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-317-7/+7
| * | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-0/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'da/difftool-git-files' into maintJunio C Hamano2014-03-181-0/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2014-03-181-0/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-182-0/+59
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-181-1/+29
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-181-0/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-181-22/+40
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-181-0/+47
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano2014-03-181-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/http-fetch-shallow-fix' into maintJunio C Hamano2014-03-189-35/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-182-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix'Junio C Hamano2014-04-081-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-021-0/+11
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'mr/opt-set-ptr'Junio C Hamano2014-04-081-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | parse-options: remove unused OPT_SET_PTRmr/opt-set-ptrMarat Radchenko2014-03-311-4/+3
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-081-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path"Junio C Hamano2014-03-241-0/+13
* | | | | | | | | | | | | | | | | Merge branch 'jk/commit-dates-parsing-fix'Junio C Hamano2014-04-081-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t4212: loosen far-in-future test for AIXjk/commit-dates-parsing-fixJeff King2014-04-011-4/+2
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'cb/aix'Junio C Hamano2014-04-032-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | tests: don't rely on strerror text when testing rmdir failurecb/aixCharles Bailey2014-03-312-4/+2
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune-overlapping-destination'Junio C Hamano2014-04-031-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fetch: handle overlaping refspecs on --prunecn/fetch-prune-overlapping-destinationCarlos Martín Nieto2014-03-261-1/+1
| * | | | | | | | | | | | | | | | | fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto2014-02-281-0/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe-i'Junio C Hamano2014-04-021-102/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pickaxe: honor -i when used with -S and --pickaxe-regexRené Scharfe2014-03-241-0/+5