summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-281-4/+5
* branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-281-0/+16
* revert: remove --reset compatibility optionjn/revert-quitJonathan Nieder2011-11-221-2/+2
* revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-221-0/+96
* revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-221-0/+54
* revert: rename --reset option to --quitJonathan Nieder2011-11-222-6/+27
* t5501-*.sh: Fix url passed to clone in setup testRamsay Jones2011-11-201-1/+1
* refs: loosen over-strict "format" checkJunio C Hamano2011-11-161-0/+7
* Revert "upload-archive: use start_command instead of fork"Junio C Hamano2011-11-151-5/+5
* Merge branch 'ab/i18n-test-fix'Junio C Hamano2011-11-062-3/+3
|\
| * t/t7508-status.sh: use test_i18ncmpab/i18n-test-fixÆvar Arnfjörð Bjarmason2011-11-051-2/+2
| * t/t6030-bisect-porcelain.sh: use test_i18ngrepÆvar Arnfjörð Bjarmason2011-11-051-1/+1
* | Merge branch 'pw/p4-appledouble-fix'Junio C Hamano2011-11-061-0/+31
|\ \
| * | git-p4: ignore apple filetypePete Wyckoff2011-11-051-0/+31
* | | t3200: add test case for 'branch -m'Stefan Naewe2011-11-021-0/+5
* | | Sync with 1.7.7.2Junio C Hamano2011-11-011-1/+1
|\ \ \
| * \ \ Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-11-011-1/+1
| |\ \ \
| | * | | t7511: avoid use of reserved filename on Windows.Pat Thoyts2011-10-311-1/+1
| * | | | Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-011-1/+58
| |\ \ \ \
| * \ \ \ \ Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-011-0/+50
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-011-0/+11
|\ \ \ \ \ \ \
| * | | | | | | (squash) test for previousJunio C Hamano2011-10-281-0/+11
* | | | | | | | Merge branch 'ef/mingw-upload-archive'Junio C Hamano2011-11-011-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | upload-archive: use start_command instead of forkErik Faye-Lund2011-10-301-5/+5
* | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-271-0/+50
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-10-271-0/+50
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | read-cache.c: fix index memory allocationRené Scharfe2011-10-261-0/+50
| * | | | | | | | Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-264-18/+85
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano2011-10-261-18/+40
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-261-0/+31
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano2011-10-261-0/+8
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2011-10-261-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-262-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6Junio C Hamano2011-10-262-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-231-0/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-231-0/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-231-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-231-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/branch-set-upstream-previous' into maintJunio C Hamano2011-09-231-0/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reset-reflog-message-fix' into maintJunio C Hamano2011-09-111-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vi/make-test-vector-less-specific' into maintJunio C Hamano2011-09-118-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-config-param' into maintJunio C Hamano2011-09-111-0/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-1.7.2-status-ignored' into maintJunio C Hamano2011-09-111-0/+121
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-211-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-211-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-211-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bk/ancestry-path' into maintJunio C Hamano2011-10-151-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/mergetool-valgrind' into maintJunio C Hamano2011-10-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-exec-edit' into maintJunio C Hamano2011-10-151-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lh/gitweb-site-html-head'Junio C Hamano2011-10-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \