summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Merge branch 'rj/path-cleanup'Junio C Hamano2012-09-147-30/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones2012-09-044-10/+11
| * | | | | | | | | | | | | | | | | | | Call git_pathdup() rather than xstrdup(git_path("..."))Ramsay Jones2012-09-042-2/+3
| * | | | | | | | | | | | | | | | | | | path.c: Use vsnpath() in the implementation of git_path()Ramsay Jones2012-09-041-12/+3
| * | | | | | | | | | | | | | | | | | | path.c: Don't discard the return value of vsnpath()Ramsay Jones2012-09-041-5/+6
| * | | | | | | | | | | | | | | | | | | path.c: Remove the 'git_' prefix from a file scope functionRamsay Jones2012-09-041-3/+3
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'rj/tap-fix'Junio C Hamano2012-09-144-63/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | test-lib.sh: Suppress the "passed all ..." message if no tests runRamsay Jones2012-09-021-1/+4
| * | | | | | | | | | | | | | | | | | | test-lib.sh: Add check for invalid use of 'skip_all' facilityRamsay Jones2012-09-021-0/+4
| * | | | | | | | | | | | | | | | | | | test-lib.sh: Fix some shell coding style violationsRamsay Jones2012-09-021-22/+38
| * | | | | | | | | | | | | | | | | | | t4016-*.sh: Skip all tests rather than each testRamsay Jones2012-09-021-11/+9
| * | | | | | | | | | | | | | | | | | | t3902-*.sh: Skip all tests rather than each testRamsay Jones2012-09-021-16/+15
| * | | | | | | | | | | | | | | | | | | t3300-*.sh: Fix a TAP parse errorRamsay Jones2012-09-021-13/+11
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-09-126-2199/+2394
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | l10n: Update Swedish translation (1166t0f0u)Peter Krefting2012-09-131-342/+373
| * | | | | | | | | | | | | | | | | | | Merge git://github.com/vnwildman/gitJiang Xin2012-09-131-392/+422
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | l10n: vi.po: update to v1.7.12-146-g16d26Tran Ngoc Quan2012-09-081-392/+422
| * | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 2 new messagesRalf Thielow2012-09-071-340/+372
| * | | | | | | | | | | | | | | | | | | | l10n: zh_CN.po: translate 2 new messagesJiang Xin2012-09-071-341/+371
| |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | l10n: Update git.pot (2 new, 4 removed messages)Jiang Xin2012-09-051-339/+345
| * | | | | | | | | | | | | | | | | | | l10n: vi.po & TEAMS: review Vietnamese translationTran Ngoc Quan2012-09-042-503/+569
* | | | | | | | | | | | | | | | | | | | Start merging the sixth batch for 1.8.0Junio C Hamano2012-09-121-33/+18
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-09-121-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Further merging in preparation for 1.7.12.1Junio C Hamano2012-09-121-0/+26
| * | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-1219-162/+321
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-122-46/+76
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-125-4/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Junio C Hamano2012-09-121-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano2012-09-129-106/+171
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-122-1/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-checkout-fileglob-doc'Junio C Hamano2012-09-122-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | gitcli: contrast wildcard given to shell and to gitJunio C Hamano2012-09-101-0/+17
| * | | | | | | | | | | | | | | | | | | | | | | | gitcli: formatting fixJunio C Hamano2012-09-101-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Document file-glob for "git checkout -- '*.c'"Junio C Hamano2012-09-041-0/+12
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/send-email-reconfirm-fix'Junio C Hamano2012-09-121-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | send-email: initial_to and initial_reply_to are both optionalStephen Boyd2012-09-061-2/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-remote-remove'Junio C Hamano2012-09-125-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-065-9/+10
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-n-doc'Junio C Hamano2012-09-122-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | doc: move rev-list option -<n> from git-log.txt to rev-list-options.txtNguyễn Thái Ngọc Duy2012-09-062-5/+4
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kd/cvsimport-avoid-invalid-tag'Junio C Hamano2012-09-121-3/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | cvsimport: strip all inappropriate tag stringsKen Dreyer2012-09-061-3/+30
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/compat-itimer'Junio C Hamano2012-09-122-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Add a no-op setitimer() wrapperJoachim Schmitz2012-09-082-0/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/compat-mkdir'Junio C Hamano2012-09-121-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Document MKDIR_WO_TRAILING_SLASH in MakefileJoachim Schmitz2012-09-081-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2012-09-121-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/gitk-reload-tag-contents' of git://github.com/gitster/gitPaul Mackerras2012-09-121-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | gitk: Fix GIT_TRACE issuesAske Olsson2012-08-041-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/gitk-reload-tag-contents'Junio C Hamano2012-09-121-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |