summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-10-08Git 1.8.0-rc1v1.8.0-rc1Junio C Hamano2-12/+4
2012-10-08Merge branch 'jc/maint-t1450-fsck-order-fix'Junio C Hamano1-3/+1
2012-10-08Merge branch 'jc/merge-bases-paint-fix'Junio C Hamano1-0/+5
2012-10-08Sync with 1.7.12.3Junio C Hamano2-1/+18
2012-10-08Git 1.7.12.3v1.7.12.3Junio C Hamano3-2/+19
2012-10-08Merge branch 'os/commit-submodule-ignore' into maintJunio C Hamano1-0/+1
2012-10-08Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maintJunio C Hamano2-5/+32
2012-10-08Merge branch 'rt/maint-clone-single' into maintJunio C Hamano3-18/+218
2012-10-08Merge branch 'jc/blame-follows-renames' into maintJunio C Hamano1-0/+6
2012-10-08Merge branch 'lt/mailinfo-handle-attachment-more-sanely' into maintJunio C Hamano1-11/+0
2012-10-05git-svn: keep leading slash when canonicalizing paths (fallback case)Jonathan Nieder1-1/+0
2012-10-05Git::SVN: rename private path fieldJonathan Nieder1-2/+2
2012-10-05git-svn: use path accessor for Git::SVN objectsEric Wong2-2/+2
2012-10-05Make git-svn branch patterns match complete URLAmmon Riley2-1/+12
2012-10-05t9164: Add missing quotes in testRobert Luberda1-4/+4
2012-10-05git-svn.perl: keep processing all commits in parents_excludeSteven Walter2-1/+53
2012-10-05git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tipSteven Walter2-5/+63
2012-10-04paint_down_to_common(): parse commit before relying on its timestampJunio C Hamano1-0/+5
2012-10-02Update draft release notes to 1.8.0Junio C Hamano1-0/+12
2012-10-02Merge branch 'nd/grep-reflog'Junio C Hamano5-5/+105
2012-10-02Merge branch 'lt/mailinfo-handle-attachment-more-sanely'Junio C Hamano1-11/+0
2012-10-02Merge branch 'tu/gc-auto-quiet'Junio C Hamano2-5/+2
2012-10-02t1450: the order the objects are checked is undefinedJunio C Hamano1-3/+1
2012-10-02Merge branch 'maint'Junio C Hamano2-1/+19
2012-10-02Start preparing for 1.7.12.3Junio C Hamano2-1/+19
2012-10-02Merge branch 'rr/maint-submodule-unknown-cmd' into maintJunio C Hamano3-4/+11
2012-10-02Merge branch 'sp/maint-http-enable-gzip' into maintJunio C Hamano3-3/+5
2012-10-02Merge branch 'sp/maint-http-info-refs-no-retry' into maintJunio C Hamano1-16/+2
2012-10-02l10n: Fix to Swedish translationPeter Krefting1-2/+2
2012-10-02Documentation: mention `push.default` in git-push.txtRamkumar Ramachandra1-3/+7
2012-10-02RelNotes/1.8.0: various typo and style fixesMichael J Gruber1-24/+24
2012-10-01Git 1.8.0-rc0v1.8.0-rc0Junio C Hamano2-1/+24
2012-10-01Merge branch 'jk/completion-tests'Junio C Hamano1-0/+60
2012-10-01Merge branch 'ep/malloc-check-perturb'Junio C Hamano2-2/+2
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano4-28/+64
2012-10-01Merge branch 'os/commit-submodule-ignore'Junio C Hamano1-0/+1
2012-10-01Merge branch 'jc/blame-follows-renames'Junio C Hamano1-0/+6
2012-10-01Merge branch 'jk/receive-pack-unpack-error-to-pusher'Junio C Hamano2-5/+32
2012-10-01Merge branch 'rt/maint-clone-single'Junio C Hamano3-18/+218
2012-09-30mailinfo: don't require "text" mime type for attachmentsLinus Torvalds1-11/+0
2012-09-29Merge git://github.com/git-l10n/git-poJunio C Hamano3-1354/+11532
2012-09-29Update draft release notes to 1.8.0Junio C Hamano1-46/+54
2012-09-29Sync with 1.7.12.2Junio C Hamano4-29/+38
2012-09-29Git 1.7.12.2v1.7.12.2Junio C Hamano3-2/+11
2012-09-29Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2-28/+28
2012-09-29Merge branch 'jc/maint-log-grep-all-match-1' into maintJunio C Hamano6-25/+217
2012-09-29Merge branch 'jc/maint-mailinfo-mime-attr' into maintJunio C Hamano6-4/+32
2012-09-29Merge branch 'rr/maint-submodule-unknown-cmd'Junio C Hamano3-4/+11
2012-09-29Merge branch 'rs/archive-zip-utf8'Junio C Hamano1-4/+45
2012-09-29Merge branch 'jk/smart-http-switch'Junio C Hamano2-4/+17
2012-09-29Merge branch 'sp/maint-http-enable-gzip'Junio C Hamano3-3/+5
2012-09-29Merge branch 'sp/maint-http-info-refs-no-retry'Junio C Hamano1-16/+2
2012-09-29Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano4-16/+73
2012-09-29Merge branch 'js/rebase-exec-command-not-found'Junio C Hamano2-0/+15
2012-09-29Merge branch 'rr/test-use-shell-path-not-shell'Junio C Hamano1-16/+16
2012-09-29revision: make --grep search in notes too if shownNguyễn Thái Ngọc Duy2-0/+11
2012-09-29log --grep-reflog: reject the option without -gJunio C Hamano5-4/+20
2012-09-29revision: add --grep-reflog to filter commits by reflog messagesNguyễn Thái Ngọc Duy5-2/+54
2012-09-29grep: prepare for new header field filterNguyễn Thái Ngọc Duy3-3/+24
2012-09-27silence git gc --auto --quiet outputTobias Ulmer2-5/+2
2012-09-27t9902: add completion tests for "odd" filenamesJeff King1-0/+19
2012-09-27t9902: add a few basic completion testsJeff King1-0/+41
2012-09-28Merge git://github.com/gotgit/git-po-zh_CNJiang Xin1-451/+3954
2012-09-28Merge branch 'maint'Jiang Xin2-28/+28
2012-09-28Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN into maintJiang Xin1-23/+23
2012-09-28Merge branch 'maint' of https://github.com/ralfth/git-po-de into maintJiang Xin1-5/+5
2012-09-27l10n: de.po: correct translation of a 'rebase' messageRalf Thielow1-5/+5
2012-09-26MALLOC_CHECK: enable it, unless disabled explicitlyRené Scharfe2-2/+2
2012-09-26l10n: Fixes to Swedish translationPeter Krefting1-5/+6
2012-09-25submodule: if $command was not matched, don't parse other argsRamkumar Ramachandra3-4/+11
2012-09-25Update draft release notes to 1.8.0Junio C Hamano1-0/+9
2012-09-25Merge branch 'rr/test-make-sure-we-have-git'Junio C Hamano2-10/+9
2012-09-25Merge branch 'js/hp-nonstop'Junio C Hamano2-1/+83
2012-09-25Merge branch 'js/poll-emu'Junio C Hamano3-8/+26
2012-09-25Merge branch 'ep/malloc-check-perturb'Junio C Hamano2-0/+24
2012-09-25Merge branch 'aj/xfuncname-ada'Junio C Hamano7-1/+66
2012-09-25Merge branch 'jc/maint-mailinfo-mime-attr'Junio C Hamano6-4/+32
2012-09-25Merge branch 'po/maint-docs'Junio C Hamano5-15/+28
2012-09-25Merge branch 'db/doc-custom-xmlto'Junio C Hamano1-2/+3
2012-09-25Merge branch 'maint'Junio C Hamano1-8/+1
2012-09-25test-lib: use $SHELL_PATH, not $SHELLRamkumar Ramachandra1-16/+16
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar4-28/+64
2012-09-25Revert "completion: fix shell expansion of items"Jeff King1-8/+1
2012-09-24Sync with maintJunio C Hamano2-3/+36
2012-09-24Start preparation for 1.7.12.2Junio C Hamano2-1/+33
2012-09-24Merge branch 'jc/maint-blame-no-such-path' into maintJunio C Hamano2-17/+74
2012-09-24Merge branch 'dj/fetch-all-tags' into maintJunio C Hamano7-39/+92
2012-09-24Improve the description of GIT_PS1_SHOWUPSTREAMJonathan "Duke" Leto1-3/+4
2012-09-24archive-zip: write extended timestampRené Scharfe1-3/+24
2012-09-24commit: pay attention to submodule.$name.ignore in .gitmodulesOrgad Shaneh1-0/+1
2012-09-21git blame: document that it always follows origin across whole-file renamesJunio C Hamano1-0/+6
2012-09-21Merge branch 'mh/fetch-filter-refs'Junio C Hamano1-3/+4
2012-09-21Merge branch 'jc/maint-log-grep-all-match-1'Junio C Hamano1-2/+2
2012-09-21remote-curl: let users turn off smart httpJeff King2-1/+14
2012-09-21receive-pack: drop "n/a" on unpacker errorsJeff King2-2/+2
2012-09-21receive-pack: send pack-processing stderr over sidebandJeff King1-2/+24
2012-09-21receive-pack: redirect unpack-objects stdout to /dev/nullJeff King1-1/+6
2012-09-21Update Swedish translation (1967t0f0u)Peter Krefting1-473/+3849
2012-09-20Merge branch 'maint'Junio C Hamano3-1/+15
2012-09-20Merge branch 'nd/maint-diffstat-summary' into maintJunio C Hamano1-6/+4
2012-09-20Merge branch 'jw/doc-commit-title' into maintJunio C Hamano7-22/+31
2012-09-20Merge branch 'dg/run-command-child-cleanup' into maintJunio C Hamano1-6/+7
2012-09-20Merge branch 'jc/mailinfo-RE' into maintJunio C Hamano1-1/+3
2012-09-20Merge branch 'sn/ls-remote-get-url-doc' into maintJunio C Hamano2-1/+6
2012-09-20Merge branch 'nd/log-n-doc' into maintJunio C Hamano2-5/+4
2012-09-20Merge branch 'nd/maint-remote-remove' into maintJunio C Hamano5-9/+10
2012-09-20grep.c: make two symbols really file-scope static this timeJunio C Hamano1-2/+2
2012-09-20clone --single: limit the fetch refspec to fetched branchRalf Thielow3-18/+218
2012-09-20remote-curl: rename is_http variableJeff King1-3/+3
2012-09-20Documentation: Document signature showing optionsStephen Boyd2-0/+7
2012-09-20Enable info/refs gzip decompression in HTTP clientShawn O. Pearce3-3/+5
2012-09-20Revert "retry request without query when info/refs?query fails"Shawn O. Pearce1-16/+2
2012-09-20completion: fix shell expansion of itemsFelipe Contreras1-1/+8
2012-09-19Port to HP NonStopJoachim Schmitz2-1/+83
2012-09-19Documentation/Makefile: Allow custom XMLTO binaryDave Borowitz1-2/+3
2012-09-19rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt1-2/+3
2012-09-19Doc branch: show -vv option and alternativePhilip Oakley1-1/+3
2012-09-18Doc clean: add See Also linkPhilip Oakley1-0/+4
2012-09-18Doc add: link gitignorePhilip Oakley1-1/+1
2012-09-18Doc: separate gitignore pattern sourcesPhilip Oakley1-12/+18
2012-09-18Doc: shallow clone deepens _to_ new depthPhilip Oakley1-1/+2
2012-09-18Update draft release notes to 1.8.0Junio C Hamano1-3/+17
2012-09-18Merge branch 'jc/maint-log-grep-all-match'Junio C Hamano6-23/+215
2012-09-18Merge branch 'jc/make-static'Junio C Hamano26-96/+69
2012-09-18Merge branch 'pw/p4-submit-conflicts'Junio C Hamano7-107/+709
2012-09-18Merge branch 'mv/cherry-pick-s'Junio C Hamano6-65/+144
2012-09-18Merge branch 'nd/fetch-status-alignment'Junio C Hamano4-10/+26
2012-09-18Sync with 1.7.12.1Junio C Hamano5-14/+33
2012-09-18Git 1.7.12.1v1.7.12.1Junio C Hamano3-2/+14
2012-09-18Merge branch 'er/doc-fast-import-done' into maintJunio C Hamano1-1/+7
2012-09-18Merge branch 'jk/config-warn-on-inaccessible-paths' into maintJunio C Hamano6-10/+34
2012-09-18t/test-lib: make sure Git has already been builtRamkumar Ramachandra2-10/+9
2012-09-18Doc: Improve shallow depth wordingPhilip Oakley1-2/+4
2012-09-18archive-zip: support UTF-8 pathsRené Scharfe1-1/+21
2012-09-18Revert "archive-zip: support UTF-8 paths"Junio C Hamano1-21/+6
2012-09-18rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2-0/+15
2012-09-18Documentation/git-filter-branch: Move note about effect of removing commitsAndreas Schwab1-10/+9
2012-09-18string_list API: document what "sorted" meansMichael Haggerty1-3/+4
2012-09-17MALLOC_CHECK: various clean-upsJunio C Hamano2-6/+21
2012-09-17rebase -i: Add tests for "--edit-todo"Andrew Wong1-0/+18
2012-09-17rebase -i: Teach "--edit-todo" actionAndrew Wong3-3/+32
2012-09-17rebase -i: Refactor help messages for todo fileAndrew Wong1-11/+20
2012-09-17rebase usage: subcommands can not be combined with -iMartin von Zweigbergk1-1/+1
2012-09-17The seventh batch for 1.8.0Junio C Hamano1-0/+29
2012-09-17Merge branch 'maint'Junio C Hamano5-8/+11
2012-09-17Merge branch 'mh/fetch-filter-refs'Junio C Hamano6-126/+134
2012-09-17Merge branch 'nd/maint-diffstat-summary'Junio C Hamano1-6/+4
2012-09-17Merge branch 'jk/config-warn-on-inaccessible-paths'Junio C Hamano1-1/+1
2012-09-17Merge branch 'jw/doc-commit-title'Junio C Hamano7-22/+31
2012-09-17Merge branch 'mh/string-list'Junio C Hamano7-10/+502
2012-09-17Merge branch 'jc/maint-blame-no-such-path'Junio C Hamano2-17/+74
2012-09-17make poll() work on platforms that can't recv() on a non-socketJoachim Schmitz1-0/+4
2012-09-17poll() exits too early with EFAULT if 1st arg is NULLJoachim Schmitz1-1/+1
2012-09-17fix some win32 specific dependencies in poll.cJoachim Schmitz1-2/+6
2012-09-17make poll available for other platforms lacking itJoachim Schmitz3-5/+15
2012-09-17mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano6-4/+32
2012-09-17t/perf: add "trash directory" to .gitignoreRamkumar Ramachandra1-2/+3
2012-09-17Add missing -z to git check-attr usage text for consistency with man pageAdam Spiers1-1/+1
2012-09-17git-jump: ignore (custom) prefix in diff modeMischa POSLAWSKY1-2/+2
2012-09-17Documentation: indent-with-non-tab uses "equivalent tabs" not 8Wesley J. Landaker1-2/+3
2012-09-16completion: add --no-edit to git-commitYacine Belkadi1-1/+2
2012-09-16Add userdiff patterns for AdaAdrian Johnson7-1/+66
2012-09-16git-p4: add submit --conflict option and config varaiablePete Wyckoff3-5/+105
2012-09-16git p4: add submit --prepare-p4-only optionPete Wyckoff3-0/+77
2012-09-16git p4: add submit --dry-run optionPete Wyckoff3-13/+75
2012-09-16git p4: accept -v for --verbosePete Wyckoff2-2/+2
2012-09-16git p4: revert deleted files after submit cancelPete Wyckoff2-0/+121
2012-09-16git p4: rearrange submit template constructionPete Wyckoff1-8/+21
2012-09-16git p4: test clean-up after failed submit, fix added filesPete Wyckoff2-2/+132
2012-09-16git p4: standardize submit cancel due to unchanged templatePete Wyckoff2-2/+4
2012-09-16git p4: move conflict prompt into run, add [q]uit inputPete Wyckoff2-16/+56
2012-09-16git p4: remove submit failure options [a]pply and [w]ritePete Wyckoff1-18/+2
2012-09-16git p4: gracefully fail if some commits could not be appliedPete Wyckoff3-56/+128
2012-09-16git p4 test: remove bash-ism of combined export/assignmentPete Wyckoff1-3/+4
2012-09-15t7810-grep: test --all-match with multiple --grep and --author optionsMichael J Gruber1-0/+20
2012-09-15t7810-grep: test interaction of multiple --grep and --author optionsMichael J Gruber1-16/+22
2012-09-15t7810-grep: test multiple --author with --all-matchMichael J Gruber1-0/+8
2012-09-15t7810-grep: test multiple --grep with and without --all-matchMichael J Gruber1-0/+16
2012-09-15t7810-grep: bring log --grep tests in common formMichael J Gruber1-6/+18
2012-09-15grep.c: mark private file-scope symbols as staticJunio C Hamano2-3/+6
2012-09-15test-string-list.c: Fix some sparse warningsRamsay Jones1-4/+4
2012-09-15sequencer.c: mark a private file-scope symbol as staticJunio C Hamano2-4/+1
2012-09-15ident.c: mark private file-scope symbols as staticJunio C Hamano2-4/+2
2012-09-15trace.c: mark a private file-scope symbol as staticJunio C Hamano2-2/+1
2012-09-15wt-status.c: mark a private file-scope symbol as staticJunio C Hamano2-4/+2
2012-09-15read-cache.c: mark a private file-scope symbol as staticJunio C Hamano2-2/+1
2012-09-15strbuf.c: mark a private file-scope symbol as staticJunio C Hamano2-15/+2
2012-09-15sha1-array.c: mark a private file-scope symbol as staticJunio C Hamano3-5/+1
2012-09-15symlinks.c: mark private file-scope symbols as staticJunio C Hamano2-4/+5
2012-09-15notes.c: mark a private file-scope symbol as staticJunio C Hamano2-16/+12
2012-09-15rerere.c: mark private file-scope symbols as staticJunio C Hamano2-2/+1
2012-09-15graph.c: mark private file-scope symbols as staticJunio C Hamano2-29/+30
2012-09-15diff.c: mark a private file-scope symbol as staticJunio C Hamano2-2/+1
2012-09-15commit.c: mark a file-scope private symbol as staticJunio C Hamano2-3/+5
2012-09-15builtin/notes.c: mark file-scope private symbols as staticJunio C Hamano2-4/+5
2012-09-14Draft release notes to 1.8.0Junio C Hamano1-0/+7
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano5-12/+41
2012-09-14Merge branch 'cn/branch-set-upstream-to'Junio C Hamano1-1/+5
2012-09-14Merge branch 'sl/autoconf'Junio C Hamano2-124/+84
2012-09-14Merge branch 'dg/run-command-child-cleanup'Junio C Hamano1-6/+7