summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* bisect: move argument parsing before state modification.Jon Seymour2011-08-042-36/+44
* Merge branch 'maint'Junio C Hamano2011-07-313-6/+20
|\
| * Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy2011-07-311-2/+13
| * t7400: fix bogus test failure with symlinked trashJeff King2011-07-311-2/+4
| * Documentation: clarify the invalidated tree entry formatCarlos Martín Nieto2011-07-311-2/+3
* | Merge branch 'maint'Junio C Hamano2011-07-241-1/+13
|\ \ | |/
| * tests: print failed test numbers at the end of the test runJens Lehmann2011-07-241-1/+13
* | Update draft release notes to 1.7.7Junio C Hamano2011-07-221-1/+16
* | Merge branch 'dc/stash-con-untracked'Junio C Hamano2011-07-223-7/+228
|\ \
| * | stash: Add --include-untracked option to stash and remove all untracked filesDavid Caldwell2011-06-263-6/+227
* | | Merge branch 'jk/tag-contains-ab'Junio C Hamano2011-07-221-1/+45
|\ \ \
| * | | Revert clock-skew based attempt to optimize tag --contains traversalJunio C Hamano2011-07-146-87/+3
| * | | git skew: a tool to find how big a clock skew exists in the historyJeff King2011-06-305-0/+54
| * | | default core.clockskew variable to one dayJeff King2011-06-111-1/+1
| * | | limit "contains" traversals based on commit timestampJeff King2011-06-111-3/+33
| * | | tag: speed up --contains calculationJeff King2011-06-111-1/+45
* | | | Merge branch 'dz/connect-error-report'Junio C Hamano2011-07-221-14/+11
|\ \ \ \
| * | | | Do not log unless all connect() attempts failDave Zarzycki2011-07-141-14/+11
* | | | | Merge branch 'mz/doc-rebase-abort'Junio C Hamano2011-07-222-7/+11
|\ \ \ \ \
| * | | | | rebase: clarify "restore the original branch"Martin von Zweigbergk2011-07-132-7/+11
| |/ / / /
* | | | | Merge branch 'bw/log-all-ref-updates-doc'Junio C Hamano2011-07-222-3/+6
|\ \ \ \ \
| * | | | | Documentation: clearly specify what refs are honored by core.logAllRefUpdatesBert Wesarg2011-07-122-3/+6
* | | | | | Merge branch 'js/maint-add-path-stat-pwd'Junio C Hamano2011-07-221-1/+2
|\ \ \ \ \ \
| * | | | | | get_pwd_cwd(): Do not trust st_dev/st_ino blindlyJohannes Schindelin2011-07-111-1/+2
* | | | | | | Merge branch 'ms/help-unknown'Junio C Hamano2011-07-221-0/+12
|\ \ \ \ \ \ \
| * | | | | | | help_unknown_cmd: do not propose an "unknown" cmdMichael Schubert2011-07-081-0/+12
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mz/doc-synopsis-verse'Junio C Hamano2011-07-2293-6/+92
|\ \ \ \ \ \ \
| * | | | | | | Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-0693-6/+92
* | | | | | | | Merge branch 'jc/checkout-reflog-fix'Junio C Hamano2011-07-221-2/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'v1.7.6' into jc/checkout-reflog-fixJunio C Hamano2011-07-061277-27194/+94555
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge commit 'v1.7.0' into jc/checkout-reflog-fixJunio C Hamano2011-07-061295-32474/+132143
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge commit 'v1.6.0' into jc/checkout-reflog-fixJunio C Hamano2011-07-06926-20440/+66638
| |\ \ \ \ \ \ \ \
| * | | | | | | | | checkout: do not write bogus reflog entry outJunio C Hamano2011-07-061-3/+5
* | | | | | | | | | Merge branch 'jc/maint-mergetool-read-fix'Junio C Hamano2011-07-221-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mergetool: check return value from readJunio C Hamano2011-07-011-4/+4
* | | | | | | | | | | Merge branch 'jn/gitweb-search'Junio C Hamano2011-07-221-199/+241
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: Make git_search_* subroutines render whole pagesJakub Narebski2011-06-221-12/+26
| * | | | | | | | | | | gitweb: Clean up code in git_search_* subroutinesJakub Narebski2011-06-221-13/+16
| * | | | | | | | | | | gitweb: Split body of git_search into subroutinesJakub Narebski2011-06-221-182/+199
| * | | | | | | | | | | gitweb: Check permissions first in git_searchJakub Narebski2011-06-221-13/+21
* | | | | | | | | | | | Merge branch 'jl/submodule-add-relurl-wo-upstream'Junio C Hamano2011-07-223-11/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule add: clean up duplicated codeJens Lehmann2011-06-061-9/+1
| * | | | | | | | | | | | submodule add: allow relative repository path even when no url is setJens Lehmann2011-06-063-4/+9
| * | | | | | | | | | | | submodule add: test failure when url is not configured in superprojectJens Lehmann2011-06-061-0/+7
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-07-225-8/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | doc/fast-import: clarify notemodify commandDmitry Ivankov2011-07-221-3/+8
| * | | | | | | | | | | | Documentation: minor grammatical fix in rev-list-options.txtJack Nagel2011-07-221-1/+1
| * | | | | | | | | | | | Documentation: git-filter-branch honors replacement refsPeter Collingbourne2011-07-211-2/+3